Skip to content

HIVE-2871 - Always show the upgradeable annotation. #2705

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
2uasimojo merged 1 commit into from
Jun 17, 2025
+10 −13
Merged

HIVE-2871 - Always show the upgradeable annotation. #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions pkg/controller/clusterversion/clusterversion_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,11 @@ func (r *ReconcileClusterVersion) updateClusterVersionMetadata(cd *hivev1.Cluste
}
}
changed = changed || upgradeableCondition != cd.Annotations[constants.MinorVersionUpgradeUnavailable]
if upgradeableCondition == "" {
delete(cd.Annotations, constants.MinorVersionUpgradeUnavailable)
} else {
if cd.Annotations == nil {
cd.Annotations = map[string]string{}
}
cd.Annotations[constants.MinorVersionUpgradeUnavailable] = upgradeableCondition

if cd.Annotations == nil {
cd.Annotations = map[string]string{}
}
cd.Annotations[constants.MinorVersionUpgradeUnavailable] = upgradeableCondition

if !changed {
cdLog.Debug("cluster version metadata has not changed, nothing to update")
Expand Down
12 changes: 6 additions & 6 deletions pkg/controller/clusterversion/clusterversion_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Status: configv1.ConditionTrue,
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
{
Expand All @@ -103,7 +103,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Status: configv1.ConditionFalse,
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "Upgradeable: False", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Upgradeable: False", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
{
Expand All @@ -118,7 +118,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Message: "Can't do the upgrade",
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "Can't do the upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Can't do the upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
{
Expand All @@ -132,7 +132,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Status: configv1.ConditionUnknown,
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "Upgradeable: Unknown", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Upgradeable: Unknown", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
{
Expand All @@ -147,7 +147,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Message: "Can't read status",
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "Can't read status", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Can't read status", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
{
Expand All @@ -166,7 +166,7 @@ func TestClusterVersionReconcile(t *testing.T) {
Message: "It can't upgrade",
}),
validate: func(t *testing.T, cd *hivev1.ClusterDeployment) {
assert.Equal(t, "It can't upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "It can't upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected value for annotation hive.openshift.io/minor-version-upgrade-unavailable")
},
},
}
Expand Down