pkg/cvo/availableupdates: Log target version when explaining risk-acceptance

Because [1]:

1. create a cluster which has 1 recommend version and 1 non-recommend version
2. create alert PodDisruptionBudgetAtLimit with warning severity
3. oc adm upgrade accept PodDisruptionBudgetAtLimit

had been creating fairly noisy output like:

  I0408 03:58:45.443626       1 alerts.go:87] refreshed: 10 alerts
  I0408 03:58:45.443753       1 availableupdates.go:534] Found 10 alerts
  I0408 03:58:45.443818       1 availableupdates.go:631] Got 0 risks
  I0408 03:58:45.445403       1 availableupdates.go:868] Risk with name "PodDisruptionBudgetAtLimit" is accepted by the cluster admin and thus not in the evaluation of conditional update
  I0408 03:58:45.445421       1 availableupdates.go:868] Risk with name "PodDisruptionBudgetAtLimit" is accepted by the cluster admin and thus not in the evaluation of conditional update
  I0408 03:58:45.445429       1 availableupdates.go:868] Risk with name "PodDisruptionBudgetAtLimit" is accepted by the cluster admin and thus not in the evaluation of conditional update
  ...
  I0408 03:58:45.446455       1 availableupdates.go:868] Risk with name "PodDisruptionBudgetAtLimit" is accepted by the cluster admin and thus not in the evaluation of conditional update
  I0408 03:58:45.446460       1 availableupdates.go:868] Risk with name "PodDisruptionBudgetAtLimit" is accepted by the cluster admin and thus not in the evaluation of conditional update
  I0408 03:58:45.446475       1 availableupdates.go:177] Requeue available-update evaluation, because "4.22.0-ec.4" is Recommended=Unknown: EvaluationFailed: Could not evaluate exposure to update risk SomeInvokerThing (invalid PromQL result length must be one, but is 0)
    SomeInvokerThing description: On clusters on default invoker user, this imaginary bug can happen.
    SomeInvokerThing URL: https://bug.example.com/a
  I0408 03:58:45.449976       1 cvo.go:816] Finished syncing available updates "openshift-cluster-version/version" (159.68958ms)

Logging the version should help distinguish confusedly looping on a
single risk for a single target version, from looping over that same
risks for multiple different target versions.

[1]: https://redhat.atlassian.net/browse/OTA-1813?focusedCommentId=16643738

Author: wking

pkg/cvo/availableupdates.go

@@ -580,7 +580,7 @@ func (u *availableUpdates) evaluateConditionalUpdates(ctx context.Context) {
 	u.RiskConditions = loadRiskConditions(ctx, risks, riskVersions, u.ConditionRegistry)
 
 	for i, conditionalUpdate := range u.ConditionalUpdates {
-		condition := evaluateConditionalUpdate(conditionalUpdate.Risks, u.AcceptRisks, u.ShouldReconcileAcceptRisks, u.RiskConditions)
+		condition := evaluateConditionalUpdate(conditionalUpdate, u.AcceptRisks, u.ShouldReconcileAcceptRisks, u.RiskConditions)
 
 		if condition.Status == metav1.ConditionTrue {
 			u.addUpdate(conditionalUpdate.Release)
@@ -666,7 +666,7 @@ func newRecommendedReason(now, want string) string {
 }
 
 func evaluateConditionalUpdate(
-	risks []configv1.ConditionalUpdateRisk,
+	conditionalUpdate configv1.ConditionalUpdate,
 	acceptRisks sets.Set[string],
 	shouldReconcileAcceptRisks func() bool,
 	riskConditions map[string][]metav1.Condition,
@@ -680,7 +680,7 @@ func evaluateConditionalUpdate(
 	}
 
 	var errorMessages []string
-	for _, risk := range risks {
+	for _, risk := range conditionalUpdate.Risks {
 		riskCondition := meta.FindStatusCondition(riskConditions[risk.Name], internal.ConditionalUpdateRiskConditionTypeApplies)
 		if riskCondition == nil {
 			// This should never happen
@@ -700,7 +700,7 @@ func evaluateConditionalUpdate(
 				recommended.Status = newRecommendedStatus(recommended.Status, metav1.ConditionTrue)
 				recommended.Reason = newRecommendedReason(recommended.Reason, recommendedReasonAllExposedRisksAccepted)
 				recommended.Message = "The update is recommended, because either risk does not apply to this cluster or it is accepted by cluster admins."
-				klog.V(2).Infof("Risk with name %q is accepted by the cluster admin and thus not in the evaluation of conditional update", risk.Name)
+				klog.V(2).Infof("Risk with name %q is accepted by the cluster admin and thus not in the evaluation of conditional update %s", risk.Name, conditionalUpdate.Release.Version)
 			} else {
 				recommended.Status = newRecommendedStatus(recommended.Status, metav1.ConditionFalse)
 				wantReason := recommendedReasonExposed

pkg/cvo/availableupdates_test.go

@@ -517,7 +517,8 @@ func TestEvaluateConditionalUpdate(t *testing.T) {
 			if tc.riskConditions == nil {
 				tc.riskConditions = map[string][]metav1.Condition{}
 			}
-			actual := evaluateConditionalUpdate(tc.risks, tc.acceptRisks, tc.shouldReconcileAcceptRisks, tc.riskConditions)
+			conditionalUpdate := configv1.ConditionalUpdate{Risks: tc.risks}
+			actual := evaluateConditionalUpdate(conditionalUpdate, tc.acceptRisks, tc.shouldReconcileAcceptRisks, tc.riskConditions)
 			if diff := cmp.Diff(tc.expected, actual); diff != "" {
 				t.Errorf("actual condition differs from expected:\n%s", diff)
 			}