Bug 1758008: Manual approval strategy ignored for subsequent releases

For an subscription with manual approval, only the initial installplan
respects the approval requires. Subsequent installplans ignore the
fact the approval status is still false and install the operator
regardless. This issue is due to catalog incorrectly transitions
the installplan into install phase without checking for approval
condition.

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

Author: dinhxuanvu

pkg/controller/operators/catalog/operator.go

@@ -935,7 +935,13 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, sub
 				}
 			}
 
-			installPlan.Status.Phase = v1alpha1.InstallPlanPhaseInstalling
+			// Use provided `installPlanApproval` to determine the appropreciate
+			// phase
+			if installPlanApproval == v1alpha1.ApprovalAutomatic {
+				installPlan.Status.Phase = v1alpha1.InstallPlanPhaseInstalling
+			} else if installPlanApproval == v1alpha1.ApprovalManual {
+				installPlan.Status.Phase = v1alpha1.InstallPlanPhaseRequiresApproval
+			}
 			for _, step := range installPlan.Status.Plan {
 				step.Status = v1alpha1.StepStatusUnknown
 			}