Add installPalnUpgradeCond earlyCon

Signed-off-by: yiraeChristineKim <[email protected]>

Author: yiraeChristineKim

controllers/operatorpolicy_controller.go

@@ -2108,11 +2108,15 @@ func (r *OperatorPolicyReconciler) musthaveInstallPlan(
 	// Only report this status when not approving an InstallPlan, because otherwise it could easily
 	// oscillate between this and another condition.
 	if policy.Spec.RemediationAction.IsInform() || (!initialInstall && !autoUpgrade) {
+		// Emit an early event to record that an upgrade is available and requires approval
+		ipUpgrade := installPlanUpgradeCond(complianceConfig, ipCSVs, nil)
+		ipUpgrade.LastTransitionTime = metav1.Now()
+
 		return updateStatus(
 			policy,
-			installPlanUpgradeCond(complianceConfig, ipCSVs, nil),
+			ipUpgrade,
 			existingInstallPlanObj(&latestInstallPlan, string(phase), complianceConfig),
-		), []metav1.Condition{}, nil
+		), []metav1.Condition{ipUpgrade}, nil
 	}
 
 	remainingCSVsToApprove, err := r.getRemainingCSVApprovals(ctx, policy, sub, &latestInstallPlan)
@@ -2121,11 +2125,15 @@ func (r *OperatorPolicyReconciler) musthaveInstallPlan(
 	}
 
 	if len(remainingCSVsToApprove) != 0 {
+		// Emit an early event that approval is required for the listed CSVs
+		ipUpgrade := installPlanUpgradeCond(complianceConfig, ipCSVs, remainingCSVsToApprove)
+		ipUpgrade.LastTransitionTime = metav1.Now()
+
 		return updateStatus(
 			policy,
-			installPlanUpgradeCond(complianceConfig, ipCSVs, remainingCSVsToApprove),
+			ipUpgrade,
 			existingInstallPlanObj(&latestInstallPlan, string(phase), complianceConfig),
-		), []metav1.Condition{}, nil
+		), []metav1.Condition{ipUpgrade}, nil
 	}
 
 	opLog.Info("Approving InstallPlan", "InstallPlanName", latestInstallPlan.Name,

controllers/operatorpolicy_status.go

@@ -204,109 +204,89 @@ func calculateComplianceCondition(policy *policyv1beta1.OperatorPolicy) metav1.C
 	idx, cond := policy.Status.GetCondition(validPolicyConditionType)
 	if idx == -1 {
 		return shortReturn("the validity of the policy is unknown")
-	} else {
-		if cond.Status != metav1.ConditionTrue {
-			// When invalid, short-circuit immediately with only the validation message.
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		// When invalid, short-circuit immediately with only the validation message.
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(opGroupConditionType)
 	if idx == -1 {
 		return shortReturn("the status of the OperatorGroup is unknown")
-	} else {
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(subConditionType)
 	if idx == -1 {
 		return shortReturn("the status of the Subscription is unknown")
-	} else {
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(installPlanConditionType)
-
 	if idx == -1 {
 		return shortReturn("the status of the InstallPlan is unknown")
-	} else {
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(csvConditionType)
 	if idx == -1 {
 		return shortReturn("the status of the ClusterServiceVersion is unknown")
-	} else {
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(crdConditionType)
 	if idx == -1 {
 		return shortReturn("the status of the CustomResourceDefinitions is unknown")
-	} else {
-
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
-
-		messages = append(messages, cond.Message)
 	}
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
+	}
+	messages = append(messages, cond.Message)
 
 	idx, cond = policy.Status.GetCondition(deploymentConditionType)
-
 	if idx == -1 {
 		return shortReturn("the status of the Deployments are unknown")
-	} else {
-
-		if cond.Status != metav1.ConditionTrue {
-			return shortReturn(cond.Message)
-		}
+	}
 
-		messages = append(messages, cond.Message)
+	if cond.Status != metav1.ConditionTrue {
+		return shortReturn(cond.Message)
 	}
 
-	idx, cond = policy.Status.GetCondition(catalogSrcConditionType)
+	messages = append(messages, cond.Message)
 
+	idx, cond = policy.Status.GetCondition(catalogSrcConditionType)
 	if idx == -1 {
 		return shortReturn("the status of the CatalogSource is unknown")
-	} else {
-		messages = append(messages, cond.Message)
+	}
 
-		if cond.Status != metav1.ConditionFalse {
-			return shortReturn(cond.Message)
-		}
+	messages = append(messages, cond.Message)
+	if cond.Status != metav1.ConditionFalse {
+		return shortReturn(cond.Message)
 	}
 
 	idx, cond = policy.Status.GetCondition(deprecationType)
 	if !policy.Spec.ComplianceType.IsMustNotHave() &&
 		policy.Spec.ComplianceConfig.DeprecationsPresent == "NonCompliant" {
 		if idx == -1 {
 			return shortReturn("The deprecation status is unknown")
-		} else {
-			if cond.Status != metav1.ConditionTrue {
-				return shortReturn(cond.Message)
-			}
-
-			messages = append(messages, cond.Message)
 		}
+		if cond.Status != metav1.ConditionTrue {
+			return shortReturn(cond.Message)
+		}
+		messages = append(messages, cond.Message)
 	}
 
 	message := strings.Join(messages, ", ")