Simplify conditionalUpdateWithRiskNamesAndRiskConditions

Author: hongkailiu

pkg/cvo/status.go

@@ -424,18 +424,19 @@ func updateClusterVersionStatus(
 
 func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) {
 	var result []configv1.ConditionalUpdate
+	for _, update := range conditionalUpdates {
+		result = append(result, *update.DeepCopy())
+	}
 	var riskNamesForDesiredImage []string
 	var riskConditions map[string][]metav1.Condition
 	updates := getAvailableUpdates()
 	if updates != nil {
 		riskConditions = updates.RiskConditions
 	}
-	for _, conditionalUpdate := range conditionalUpdates {
+	for i, conditionalUpdate := range result {
 		riskNames := sets.New[string]()
-		var risks []configv1.ConditionalUpdateRisk
-		for _, risk := range conditionalUpdate.Risks {
+		for j, risk := range conditionalUpdate.Risks {
 			riskNames.Insert(risk.Name)
-			riskTypesToRemove := sets.New[string]()
 			conditions, ok := riskConditions[risk.Name]
 			if !ok {
 				// This should never happen
@@ -447,28 +448,14 @@ func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []config
 					},
 				}
 			}
-			for _, condition := range risk.Conditions {
-				if found := meta.FindStatusCondition(conditions, condition.Type); found == nil {
-					riskTypesToRemove.Insert(condition.Type)
-				}
-			}
-			for riskTypeToRemove := range riskTypesToRemove {
-				meta.RemoveStatusCondition(&risk.Conditions, riskTypeToRemove)
-			}
-			for _, condition := range conditions {
-				meta.SetStatusCondition(&risk.Conditions, condition)
-			}
-			risks = append(risks, risk)
+			result[i].Risks[j].Conditions = conditions
 		}
 		if riskNames.Len() > 0 {
-			conditionalUpdate.RiskNames = sets.List[string](riskNames)
+			result[i].RiskNames = sets.List[string](riskNames)
 		}
-		conditionalUpdate.Risks = risks
-
 		if desiredImage == conditionalUpdate.Release.Image {
-			riskNamesForDesiredImage = conditionalUpdate.RiskNames
+			riskNamesForDesiredImage = result[i].RiskNames
 		}
-		result = append(result, conditionalUpdate)
 	}
 	return result, riskNamesForDesiredImage
 }