Merge pull request #356 from wking/log-upgradeable-blocks-minor

Bug 1823306: pkg/cvo/upgradeable: Mention "between minor versions"

Author: openshift-merge-robot

pkg/cvo/cvo_test.go

@@ -2769,7 +2769,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
 					Type:    configv1.OperatorUpgradeable,
 					Status:  configv1.ConditionFalse,
 					Reason:  "RandomReason",
-					Message: "Cluster operator default-operator-1 cannot be upgraded: some random reason why upgrades are not safe.",
+					Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.",
 				}},
 			},
 		},
@@ -2824,7 +2824,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
 					Type:    configv1.OperatorUpgradeable,
 					Status:  configv1.ConditionFalse,
 					Reason:  "RandomReason",
-					Message: "Cluster operator default-operator-1 cannot be upgraded: some random reason why upgrades are not safe.",
+					Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.",
 				}},
 			},
 		},
@@ -2882,7 +2882,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
 					Type:    configv1.OperatorUpgradeable,
 					Status:  configv1.ConditionFalse,
 					Reason:  "RandomReason",
-					Message: "Cluster operator default-operator-1 cannot be upgraded: some random reason why upgrades are not safe.",
+					Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.",
 				}},
 			},
 		},
@@ -2942,7 +2942,7 @@ func TestOperator_upgradeableSync(t *testing.T) {
 					Type:    configv1.OperatorUpgradeable,
 					Status:  configv1.ConditionFalse,
 					Reason:  "ClusterOperatorsNotUpgradeable",
-					Message: "Multiple cluster operators cannot be upgradeable:\n* Cluster operator default-operator-1 cannot be upgraded: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 cannot be upgraded: RandomReason2: some random reason 2 why upgrades are not safe.",
+					Message: "Multiple cluster operators cannot be upgraded between minor versions:\n* Cluster operator default-operator-1 cannot be upgraded between minor versions: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 cannot be upgraded between minor versions: RandomReason2: some random reason 2 why upgrades are not safe.",
 				}},
 			},
 		},
@@ -3005,12 +3005,12 @@ func TestOperator_upgradeableSync(t *testing.T) {
 					Type:    configv1.OperatorUpgradeable,
 					Status:  configv1.ConditionFalse,
 					Reason:  "MultipleReasons",
-					Message: "Cluster cannot be upgraded for multiple reasons: ClusterOperatorsNotUpgradeable,ClusterVersionOverridesSet",
+					Message: "Cluster cannot be upgraded between minor versions for multiple reasons: ClusterOperatorsNotUpgradeable,ClusterVersionOverridesSet",
 				}, {
 					Type:    "UpgradeableClusterOperators",
 					Status:  configv1.ConditionFalse,
 					Reason:  "ClusterOperatorsNotUpgradeable",
-					Message: "Multiple cluster operators cannot be upgradeable:\n* Cluster operator default-operator-1 cannot be upgraded: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 cannot be upgraded: RandomReason2: some random reason 2 why upgrades are not safe.",
+					Message: "Multiple cluster operators cannot be upgraded between minor versions:\n* Cluster operator default-operator-1 cannot be upgraded between minor versions: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 cannot be upgraded between minor versions: RandomReason2: some random reason 2 why upgrades are not safe.",
 				}, {
 					Type:    "UpgradeableClusterVersionOverrides",
 					Status:  configv1.ConditionFalse,

pkg/cvo/upgradeable.go

@@ -52,7 +52,7 @@ func (optr *Operator) syncUpgradeable(config *configv1.ClusterVersion) error {
 			Type:               configv1.OperatorUpgradeable,
 			Status:             configv1.ConditionFalse,
 			Reason:             "MultipleReasons",
-			Message:            fmt.Sprintf("Cluster cannot be upgraded for multiple reasons: %s", strings.Join(reasons, ",")),
+			Message:            fmt.Sprintf("Cluster cannot be upgraded between minor versions for multiple reasons: %s", strings.Join(reasons, ",")),
 			LastTransitionTime: now,
 		})
 	}
@@ -170,14 +170,14 @@ func (check *clusterOperatorsUpgradeable) Check() *configv1.ClusterOperatorStatu
 	reason := ""
 	if len(notup) == 1 {
 		reason = notup[0].condition.Reason
-		msg = fmt.Sprintf("Cluster operator %s cannot be upgraded: %s", notup[0].name, notup[0].condition.Message)
+		msg = fmt.Sprintf("Cluster operator %s cannot be upgraded between minor versions: %s", notup[0].name, notup[0].condition.Message)
 	} else {
 		reason = "ClusterOperatorsNotUpgradeable"
 		var msgs []string
 		for _, cond := range notup {
-			msgs = append(msgs, fmt.Sprintf("Cluster operator %s cannot be upgraded: %s: %s", cond.name, cond.condition.Reason, cond.condition.Message))
+			msgs = append(msgs, fmt.Sprintf("Cluster operator %s cannot be upgraded between minor versions: %s: %s", cond.name, cond.condition.Reason, cond.condition.Message))
 		}
-		msg = fmt.Sprintf("Multiple cluster operators cannot be upgradeable:\n* %s", strings.Join(msgs, "\n* "))
+		msg = fmt.Sprintf("Multiple cluster operators cannot be upgraded between minor versions:\n* %s", strings.Join(msgs, "\n* "))
 	}
 	cond.Reason = reason
 	cond.Message = msg