ToSquash: evaluateAlertRisks more often

Author: hongkailiu

pkg/cvo/status.go

@@ -177,7 +177,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 		original = config.DeepCopy()
 	}
 
-	updateClusterVersionStatus(&config.Status, status, optr.release, optr.getAvailableUpdates, optr.enabledCVOFeatureGates, validationErrs, optr.shouldReconcileAcceptRisks)
+	updateClusterVersionStatus(ctx, &config.Status, status, optr.release, optr.getAvailableUpdates, optr.enabledCVOFeatureGates, validationErrs, optr.shouldReconcileAcceptRisks)
 
 	if klog.V(6).Enabled() {
 		klog.Infof("Apply config: %s", cmp.Diff(original, config))
@@ -189,6 +189,7 @@ func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1
 
 // updateClusterVersionStatus updates the passed cvStatus with the latest status information
 func updateClusterVersionStatus(
+	ctx context.Context,
 	cvStatus *configv1.ClusterVersionStatus,
 	status *SyncWorkerStatus,
 	release configv1.Release,
@@ -233,6 +234,9 @@ func updateClusterVersionStatus(
 		if updates != nil {
 			riskConditions = updates.RiskConditions
 			alertRisks = updates.AlertRisks
+			if err := updates.evaluateAlertRisks(ctx); err != nil {
+				klog.Errorf("Failed to evaluate alert conditions: %v", err)
+			}
 		}
 		cvStatus.ConditionalUpdates, riskNamesForDesiredImage = conditionalUpdateWithRiskNamesAndRiskConditions(cvStatus.ConditionalUpdates, riskConditions, desired.Image)
 		cvStatus.ConditionalUpdateRisks = conditionalUpdateRisks(cvStatus.ConditionalUpdates, alertRisks)

pkg/cvo/status_test.go

@@ -752,7 +752,7 @@ func TestUpdateClusterVersionStatus_FilteringMultipleErrorsForFailingCondition(t
 				if tc.shouldModifyWhenNotReconcilingAndHistoryNotEmpty && !c.isReconciling && !c.isHistoryEmpty {
 					expectedCondition = tc.expectedConditionModified
 				}
-				updateClusterVersionStatus(cvStatus, tc.args.syncWorkerStatus, release, getAvailableUpdates, gates, noErrors, func() bool {
+				updateClusterVersionStatus(context.TODO(), cvStatus, tc.args.syncWorkerStatus, release, getAvailableUpdates, gates, noErrors, func() bool {
 					return false
 				})
 				condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, internal.ClusterStatusFailing)