Change label for vintage/capi detection

Signed-off-by: Matias Charriere <[email protected]>
giantswarm · Jun 27, 2024 · 4b8ed8c · 4b8ed8c
1 parent c3eb228
commit 4b8ed8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Change the label used to detect whether the Cluster is Vintage or CAPI based.
+
 ## [0.10.0] - 2024-04-30
 
 ### Added

diff --git a/controllers/cluster_controller.go b/controllers/cluster_controller.go
@@ -116,7 +116,7 @@ func (r *ClusterReconciler) reconcile(ctx context.Context, cluster *capi.Cluster
 	if deletionTimeReached(cluster) {
 		if !r.DryRun {
 			// if it's a vintage cluster, we just try to remove the Cluster CR
-			if _, ok := cluster.Labels[vintageReleaseVersion]; ok {
+			if _, ok := cluster.Labels[clusterOperatorVersion]; ok {
 				err := deleteVintageCluster(ctx, log, r.Client, cluster)
 				if err != nil {
 					return ctrl.Result{}, err

diff --git a/controllers/utility.go b/controllers/utility.go
@@ -32,7 +32,7 @@ const (
 	// fluxLabel is the label for checking if the cluster is created via git-ops
 	fluxLabel = "kustomize.toolkit.fluxcd.io/name"
 
-	vintageReleaseVersion = "release.giantswarm.io/version"
+	clusterOperatorVersion = "cluster-operator.giantswarm.io/version"
 )
 
 func requeue() reconcile.Result {