Fix InstallPlan stale variable issue

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

pkg/controller/operators/catalog/operator.go

@@ -928,8 +928,10 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, sub
 			for _, sub := range subs {
 				ownerWasAdded = ownerWasAdded || !ownerutil.EnsureOwner(installPlan, sub)
 			}
+
+			out := installPlan.DeepCopy()
 			if ownerWasAdded {
-				_, err := o.client.OperatorsV1alpha1().InstallPlans(installPlan.GetNamespace()).Update(installPlan)
+				out, err = o.client.OperatorsV1alpha1().InstallPlans(installPlan.GetNamespace()).Update(installPlan)
 				if err != nil {
 					return nil, err
 				}
@@ -938,19 +940,18 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, sub
 			// Use provided `installPlanApproval` to determine the appropreciate
 			// phase
 			if installPlanApproval == v1alpha1.ApprovalAutomatic {
-				installPlan.Status.Phase = v1alpha1.InstallPlanPhaseInstalling
+				out.Status.Phase = v1alpha1.InstallPlanPhaseInstalling
 			} else {
-				logger.Info("Testing")
-				installPlan.Status.Phase = v1alpha1.InstallPlanPhaseRequiresApproval
+				out.Status.Phase = v1alpha1.InstallPlanPhaseRequiresApproval
 			}
-			for _, step := range installPlan.Status.Plan {
+			for _, step := range out.Status.Plan {
 				step.Status = v1alpha1.StepStatusUnknown
 			}
-			_, err = o.client.OperatorsV1alpha1().InstallPlans(namespace).UpdateStatus(installPlan)
+			res, err := o.client.OperatorsV1alpha1().InstallPlans(namespace).UpdateStatus(out)
 			if err != nil {
 				return nil, err
 			}
-			return reference.GetReference(installPlan)
+			return reference.GetReference(res)
 		}
 	}
 	logger.Warn("no installplan found with matching manifests, creating new one")

test/e2e/util_test.go

@@ -40,7 +40,7 @@ import (
 
 const (
 	pollInterval = 1 * time.Second
-	pollDuration = 2 * time.Minute
+	pollDuration = 5 * time.Minute
 
 	olmConfigMap = "olm-operators"
 	// sync name with scripts/install_local.sh