Extract two cases from convertErrorToProgressing into its own function

Author: hongkailiu

pkg/cvo/status.go

@@ -598,13 +598,13 @@ func convertErrorToProgressingForUpdateEffectNone(uErr *payload.UpdateError, now
 	}
 	// returns true in those slow cases because it is still only a suspicion
 	if len(exceeded) > 0 && !machineConfig {
-		return slowCOUpdatePrefix + uErr.Reason, fmt.Sprintf("waiting on %s over 30 minutes which is longer than expected", strings.Join(exceeded, ", ")), true
+		return fmt.Sprintf("%s%s", slowCOUpdatePrefix, uErr.Reason), fmt.Sprintf("waiting on %s over 30 minutes which is longer than expected", strings.Join(exceeded, ", ")), true
 	}
 	if len(exceeded) > 0 && machineConfig {
-		return slowCOUpdatePrefix + uErr.Reason, fmt.Sprintf("waiting on %s over 30 minutes and machine-config over 90 minutes which is longer than expected", strings.Join(exceeded, ", ")), true
+		return fmt.Sprintf("%s%s", slowCOUpdatePrefix, uErr.Reason), fmt.Sprintf("waiting on %s over 30 minutes and machine-config over 90 minutes which is longer than expected", strings.Join(exceeded, ", ")), true
 	}
 	if len(exceeded) == 0 && machineConfig {
-		return slowCOUpdatePrefix + uErr.Reason, "waiting on machine-config over 90 minutes which is longer than expected", true
+		return fmt.Sprintf("%s%s", slowCOUpdatePrefix, uErr.Reason), "waiting on machine-config over 90 minutes which is longer than expected", true
 	}
 	return uErr.Reason, fmt.Sprintf("waiting on %s", strings.Join(names, ", ")), true
 }