refactor(controller): fix PR review findings

apache · Jul 2, 2019 · b74a86c · b74a86c
1 parent 01266d4
commit b74a86c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/pkg/controller/build/build_controller.go b/pkg/controller/build/build_controller.go
@@ -170,10 +170,10 @@ func (r *ReconcileBuild) Reconcile(request reconcile.Request) (reconcile.Result,
 		NewErrorRecoveryAction(),
 	}
 
-	var targetPhase v1alpha1.BuildPhase
 	var err error
 
 	target := instance.DeepCopy()
+	targetPhase := target.Status.Phase
 	targetLog := rlog.ForBuild(target)
 
 	for _, a := range actions {
@@ -187,9 +187,7 @@ func (r *ReconcileBuild) Reconcile(request reconcile.Request) (reconcile.Result,
 
 			target, err = a.Handle(ctx, target)
 			if err != nil {
-				return reconcile.Result{
-					Requeue: true,
-				}, nil
+				return reconcile.Result{}, err
 			}
 
 			if target != nil {

diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
@@ -254,17 +254,13 @@ func (r *ReconcileIntegration) Reconcile(request reconcile.Request) (reconcile.R
 
 			target, err = a.Handle(ctx, target)
 			if err != nil {
-				return reconcile.Result{
-					Requeue: true,
-				}, nil
+				return reconcile.Result{}, err
 			}
 
 			if target != nil {
 				dgst, err := digest.ComputeForIntegration(target)
 				if err != nil {
-					return reconcile.Result{
-						Requeue: true,
-					}, nil
+					return reconcile.Result{}, err
 				}
 
 				target.Status.Digest = dgst

diff --git a/pkg/controller/integrationkit/integrationkit_controller.go b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -164,17 +164,13 @@ func (r *ReconcileIntegrationKit) Reconcile(request reconcile.Request) (reconcil
 
 			target, err = a.Handle(ctx, target)
 			if err != nil {
-				return reconcile.Result{
-					Requeue: true,
-				}, nil
+				return reconcile.Result{}, err
 			}
 
 			if target != nil {
 				dgst, err := digest.ComputeForIntegrationKit(target)
 				if err != nil {
-					return reconcile.Result{
-						Requeue: true,
-					}, nil
+					return reconcile.Result{}, err
 				}
 
 				target.Status.Digest = dgst

diff --git a/pkg/controller/integrationplatform/integrationplatform_controller.go b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -149,9 +149,7 @@ func (r *ReconcileIntegrationPlatform) Reconcile(request reconcile.Request) (rec
 
 			target, err = a.Handle(ctx, target)
 			if err != nil {
-				return reconcile.Result{
-					Requeue: true,
-				}, nil
+				return reconcile.Result{}, err
 			}
 
 			if target != nil {