From 7732e62a79cec32409aa2bfaf8d3fb20bf3be255 Mon Sep 17 00:00:00 2001 From: Alexander Matyushentsev Date: Thu, 24 May 2018 10:34:12 -0700 Subject: [PATCH] Issue #233 - Controller does not persist rollback operation result --- controller/controller.go | 2 +- test/e2e/app_management_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/controller.go b/controller/controller.go index 07ac8aaf7edd6..4f39987e77502 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -365,7 +365,7 @@ func (ctrl *ApplicationController) processRequestedAppOperation(app *appv1.Appli opRes := ctrl.appStateManager.SyncAppState(app, deploymentInfo.Revision, &deploymentInfo.ComponentParameterOverrides, app.Operation.Rollback.DryRun, app.Operation.Rollback.Prune) state.Phase = opRes.Phase state.Message = opRes.Message - state.RollbackResult = opRes.RollbackResult + state.RollbackResult = opRes.SyncResult } } else { state.Phase = appv1.OperationFailed diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go index 48a5d7168f21e..87af237f5c42a 100644 --- a/test/e2e/app_management_test.go +++ b/test/e2e/app_management_test.go @@ -137,6 +137,7 @@ func TestAppManagement(t *testing.T) { }) assert.Equal(t, v1alpha1.ComparisonStatusSynced, app.Status.ComparisonResult.Status) assert.True(t, app.Status.OperationState.RollbackResult != nil) + assert.Equal(t, 2, len(app.Status.OperationState.RollbackResult.Resources)) assert.True(t, app.Status.OperationState.Phase == v1alpha1.OperationSucceeded) assert.Equal(t, 3, len(app.Status.History)) })