Merge pull request #1348 from hongkailiu/accept-risks-diff

openshift-merge-bot[bot] · web-flow · commit fc12988bb23f · 2026-03-14T01:49:02.000Z
OTA-1546: Evaluate conditional updates if accept risks change
diff --git a/pkg/cvo/availableupdates.go b/pkg/cvo/availableupdates.go
@@ -99,6 +99,9 @@ func (optr *Operator) syncAvailableUpdates(ctx context.Context, config *configv1
 				break
 			}
 		}
+		if !acceptRisks.Equal(optrAvailableUpdates.AcceptRisks) {
+			needsConditionalUpdateEval = true
+		}
 		if !needsConditionalUpdateEval {
 			klog.V(2).Infof("Available updates were recently retrieved, with less than %s elapsed since %s, will try later.", optr.minimumUpdateCheckInterval, optrAvailableUpdates.LastAttempt.Format(time.RFC3339))
 			return nil
@@ -142,8 +145,6 @@ func (optr *Operator) syncAvailableUpdates(ctx context.Context, config *configv1
 		optrAvailableUpdates.UpdateService = updateService
 		optrAvailableUpdates.Channel = channel
 		optrAvailableUpdates.Architecture = desiredArch
-		optrAvailableUpdates.ShouldReconcileAcceptRisks = optr.shouldReconcileAcceptRisks
-		optrAvailableUpdates.AcceptRisks = acceptRisks
 		optrAvailableUpdates.ConditionRegistry = optr.conditionRegistry
 		optrAvailableUpdates.Condition = condition
 
@@ -159,6 +160,8 @@ func (optr *Operator) syncAvailableUpdates(ctx context.Context, config *configv1
 		}
 	}
 
+	optrAvailableUpdates.AcceptRisks = acceptRisks
+	optrAvailableUpdates.ShouldReconcileAcceptRisks = optr.shouldReconcileAcceptRisks
 	optrAvailableUpdates.evaluateConditionalUpdates(ctx)
 
 	queueKey := optr.queueKey()

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ func (optr Operator) syncAvailableUpdates(ctx context.Context, config configv1`
`99`	`99`	`break`
`100`	`100`	`}`
`101`	`101`	`}`
	`102`	`+ if !acceptRisks.Equal(optrAvailableUpdates.AcceptRisks) {`
	`103`	`+ needsConditionalUpdateEval = true`
	`104`	`+ }`
`102`	`105`	`if !needsConditionalUpdateEval {`
`103`	`106`	`klog.V(2).Infof("Available updates were recently retrieved, with less than %s elapsed since %s, will try later.", optr.minimumUpdateCheckInterval, optrAvailableUpdates.LastAttempt.Format(time.RFC3339))`
`104`	`107`	`return nil`
`@@ -142,8 +145,6 @@ func (optr Operator) syncAvailableUpdates(ctx context.Context, config configv1`
`142`	`145`	`optrAvailableUpdates.UpdateService = updateService`
`143`	`146`	`optrAvailableUpdates.Channel = channel`
`144`	`147`	`optrAvailableUpdates.Architecture = desiredArch`
`145`		`- optrAvailableUpdates.ShouldReconcileAcceptRisks = optr.shouldReconcileAcceptRisks`
`146`		`- optrAvailableUpdates.AcceptRisks = acceptRisks`
`147`	`148`	`optrAvailableUpdates.ConditionRegistry = optr.conditionRegistry`
`148`	`149`	`optrAvailableUpdates.Condition = condition`
`149`	`150`
`@@ -159,6 +160,8 @@ func (optr Operator) syncAvailableUpdates(ctx context.Context, config configv1`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`
	`163`	`+ optrAvailableUpdates.AcceptRisks = acceptRisks`
	`164`	`+ optrAvailableUpdates.ShouldReconcileAcceptRisks = optr.shouldReconcileAcceptRisks`
`162`	`165`	`optrAvailableUpdates.evaluateConditionalUpdates(ctx)`
`163`	`166`
`164`	`167`	`queueKey := optr.queueKey()`