Skip to content

HIVE-2819: Use annotation instead of label for upgradeable #2650

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-bot merged 1 commit into from
Apr 1, 2025
Merged

HIVE-2819: Use annotation instead of label for upgradeable #2650

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
17 changes: 10 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 @@ -167,7 +167,7 @@ func (r *ReconcileClusterVersion) Reconcile(ctx context.Context, request reconci
return reconcile.Result{}, err
}

if err := r.updateClusterVersionLabels(cd, clusterVersion, cdLog); err != nil {
if err := r.updateClusterVersionMetadata(cd, clusterVersion, cdLog); err != nil {
return reconcile.Result{}, err
}

Expand All @@ -182,7 +182,7 @@ func (r *ReconcileClusterVersion) Reconcile(ctx context.Context, request reconci
return reconcile.Result{RequeueAfter: requeueAfter}, nil
}

func (r *ReconcileClusterVersion) updateClusterVersionLabels(cd *hivev1.ClusterDeployment, clusterVersion *openshiftapiv1.ClusterVersion, cdLog log.FieldLogger) error {
func (r *ReconcileClusterVersion) updateClusterVersionMetadata(cd *hivev1.ClusterDeployment, clusterVersion *openshiftapiv1.ClusterVersion, cdLog log.FieldLogger) error {
changed := false
cvoVersion := clusterVersion.Status.Desired.Version
if cd.Labels == nil {
Expand Down Expand Up @@ -221,20 +221,23 @@ func (r *ReconcileClusterVersion) updateClusterVersionLabels(cd *hivev1.ClusterD
break
}
}
changed = changed || upgradeableCondition != cd.Labels[constants.MinorVersionUpgradeUnavailable]
changed = changed || upgradeableCondition != cd.Annotations[constants.MinorVersionUpgradeUnavailable]
if upgradeableCondition == "" {
delete(cd.Labels, constants.MinorVersionUpgradeUnavailable)
delete(cd.Annotations, constants.MinorVersionUpgradeUnavailable)
} else {
cd.Labels[constants.MinorVersionUpgradeUnavailable] = upgradeableCondition
if cd.Annotations == nil {
cd.Annotations = map[string]string{}
}
cd.Annotations[constants.MinorVersionUpgradeUnavailable] = upgradeableCondition
}

if !changed {
cdLog.Debug("labels have not changed, nothing to update")
cdLog.Debug("cluster version metadata has not changed, nothing to update")
return nil
}

if err := r.Update(context.TODO(), cd); err != nil {
cdLog.WithError(err).Log(controllerutils.LogLevel(err), "error update cluster deployment labels")
cdLog.WithError(err).Log(controllerutils.LogLevel(err), "error updating cluster deployment metadata")
return err
}
return nil
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
{
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Upgradeable: False", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
{
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Can't do the upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
{
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Upgradeable: Unknown", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
{
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "Can't read status", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
{
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.Labels[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
assert.Equal(t, "It can't upgrade", cd.Annotations[constants.MinorVersionUpgradeUnavailable], "unexpected version major-minor-patch label")
},
},
}
Expand Down