Skip to content

Bug 2011954: pkg/cvo/upgradeable: Include messages for multiple-reason Upgradeable=False #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Oct 9, 2021
Merged

Bug 2011954: pkg/cvo/upgradeable: Include messages for multiple-reason Upgradeable=False #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2d2581
pkg/cvo/upgradeable: Soften "cannot be upgraded" to "should not be up…
wking Jun 17, 2021
9fd50d3
pkg/cvo/upgradeable: Include messages for multiple-reason Upgradeable…
wking Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/cvo/cvo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2933,7 +2933,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.",
}},
},
},
Expand Down Expand Up @@ -2994,7 +2994,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.",
}},
},
},
Expand Down Expand Up @@ -3058,7 +3058,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.",
}},
},
},
Expand Down Expand Up @@ -3124,7 +3124,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.",
}},
},
},
Expand Down Expand Up @@ -3193,12 +3193,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: ClusterVersionOverridesSet,ClusterOperatorsNotUpgradeable\n* Disabling ownership via cluster version overrides prevents upgrades. Please remove overrides before continuing.\n* 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: "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,
Expand Down
12 changes: 7 additions & 5 deletions pkg/cvo/upgradeable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ func (optr *Operator) setUpgradeableConditions() {
now := metav1.Now()
var conds []configv1.ClusterOperatorStatusCondition
var reasons []string
var msgs []string
for _, check := range optr.upgradeableChecks {
if cond := check.Check(); cond != nil {
reasons = append(reasons, cond.Reason)
msgs = append(msgs, cond.Message)
cond.LastTransitionTime = now
conds = append(conds, *cond)
}
Expand All @@ -72,7 +74,7 @@ func (optr *Operator) setUpgradeableConditions() {
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\n* %s", strings.Join(reasons, ","), strings.Join(msgs, "\n* ")),
LastTransitionTime: now,
})
}
Expand Down Expand Up @@ -187,14 +189,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
Expand Down Expand Up @@ -363,14 +365,14 @@ func (check *clusterAdminAcksCompletedUpgradeable) Check() *configv1.ClusterOper

func (optr *Operator) defaultUpgradeableChecks() []upgradeableCheck {
return []upgradeableCheck{
&clusterVersionOverridesUpgradeable{name: optr.name, cvLister: optr.cvLister},
&clusterAdminAcksCompletedUpgradeable{
adminGatesLister: optr.cmConfigManagedLister,
adminAcksLister: optr.cmConfigLister,
cvLister: optr.cvLister,
cvoName: optr.name,
},
&clusterOperatorsUpgradeable{coLister: optr.coLister},
&clusterVersionOverridesUpgradeable{name: optr.name, cvLister: optr.cvLister},
}
}

Expand Down