diff --git a/pkg/cvo/cvo_test.go b/pkg/cvo/cvo_test.go index f89fe64ab..f896c853f 100644 --- a/pkg/cvo/cvo_test.go +++ b/pkg/cvo/cvo_test.go @@ -2892,7 +2892,7 @@ func TestOperator_upgradeableSync(t *testing.T) { Type: configv1.OperatorUpgradeable, Status: configv1.ConditionFalse, Reason: "RandomReason", - Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.", + Message: "Cluster operator default-operator-1 should not be upgraded between minor versions: some random reason why upgrades are not safe.", }}, }, }, @@ -2949,7 +2949,7 @@ func TestOperator_upgradeableSync(t *testing.T) { Type: configv1.OperatorUpgradeable, Status: configv1.ConditionFalse, Reason: "RandomReason", - Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.", + Message: "Cluster operator default-operator-1 should not be upgraded between minor versions: some random reason why upgrades are not safe.", }}, }, }, @@ -3009,7 +3009,7 @@ func TestOperator_upgradeableSync(t *testing.T) { Type: configv1.OperatorUpgradeable, Status: configv1.ConditionFalse, Reason: "RandomReason", - Message: "Cluster operator default-operator-1 cannot be upgraded between minor versions: some random reason why upgrades are not safe.", + Message: "Cluster operator default-operator-1 should not be upgraded between minor versions: some random reason why upgrades are not safe.", }}, }, }, @@ -3071,7 +3071,7 @@ func TestOperator_upgradeableSync(t *testing.T) { Type: configv1.OperatorUpgradeable, Status: configv1.ConditionFalse, Reason: "ClusterOperatorsNotUpgradeable", - 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.", + Message: "Multiple cluster operators should not be upgraded between minor versions:\n* Cluster operator default-operator-1 should not be upgraded between minor versions: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 should not be upgraded between minor versions: RandomReason2: some random reason 2 why upgrades are not safe.", }}, }, }, @@ -3136,12 +3136,12 @@ func TestOperator_upgradeableSync(t *testing.T) { Type: configv1.OperatorUpgradeable, Status: configv1.ConditionFalse, Reason: "MultipleReasons", - Message: "Cluster cannot be upgraded between minor versions for multiple reasons: ClusterOperatorsNotUpgradeable,ClusterVersionOverridesSet", + Message: "Cluster should not be upgraded between minor versions for multiple reasons: ClusterOperatorsNotUpgradeable,ClusterVersionOverridesSet", }, { Type: "UpgradeableClusterOperators", Status: configv1.ConditionFalse, Reason: "ClusterOperatorsNotUpgradeable", - 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.", + Message: "Multiple cluster operators should not be upgraded between minor versions:\n* Cluster operator default-operator-1 should not be upgraded between minor versions: RandomReason: some random reason why upgrades are not safe.\n* Cluster operator default-operator-2 should not be upgraded between minor versions: RandomReason2: some random reason 2 why upgrades are not safe.", }, { Type: "UpgradeableClusterVersionOverrides", Status: configv1.ConditionFalse, diff --git a/pkg/cvo/upgradeable.go b/pkg/cvo/upgradeable.go index 253aed0ba..e9d2d843e 100644 --- a/pkg/cvo/upgradeable.go +++ b/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 between minor versions for multiple reasons: %s", strings.Join(reasons, ",")), + Message: fmt.Sprintf("Cluster should not 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 between minor versions: %s", notup[0].name, notup[0].condition.Message) + msg = fmt.Sprintf("Cluster operator %s should not 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 between minor versions: %s: %s", cond.name, cond.condition.Reason, cond.condition.Message)) + msgs = append(msgs, fmt.Sprintf("Cluster operator %s should not be upgraded between minor versions: %s: %s", cond.name, cond.condition.Reason, cond.condition.Message)) } - msg = fmt.Sprintf("Multiple cluster operators cannot be upgraded between minor versions:\n* %s", strings.Join(msgs, "\n* ")) + msg = fmt.Sprintf("Multiple cluster operators should not be upgraded between minor versions:\n* %s", strings.Join(msgs, "\n* ")) } cond.Reason = reason cond.Message = msg