Merge pull request #1886 from salasberryfin/fix-duplicate-annotation-constant

salasberryfin · web-flow · commit eff9389917f1 · 2025-11-11T11:14:17.000+01:00
fix: duplicate externally managed annotation value
diff --git a/internal/controllers/helpers.go b/internal/controllers/helpers.go
@@ -54,7 +54,6 @@ const (
 	v1ClusterMigrated         = "cluster-api.cattle.io/migrated"
 	fleetNamespaceMigrated    = "cluster-api.cattle.io/fleet-namespace-migrated"
 	fleetDisabledLabel        = "cluster-api.cattle.io/disable-fleet-auto-import"
-	externalFleetAnnotation   = "provisioning.cattle.io/externally-managed"
 
 	defaultRequeueDuration = 1 * time.Minute
 	trueValue              = "true"
diff --git a/internal/controllers/import_controller_v3.go b/internal/controllers/import_controller_v3.go
@@ -591,8 +591,8 @@ func (r *CAPIImportManagementV3Reconciler) optOutOfFleetManagement(ctx context.C
 		annotations = map[string]string{}
 	}
 
-	if _, found := annotations[externalFleetAnnotation]; !found {
-		annotations[externalFleetAnnotation] = trueValue
+	if _, found := annotations[turtlesannotations.ExternalFleetAnnotation]; !found {
+		annotations[turtlesannotations.ExternalFleetAnnotation] = trueValue
 		rancherCluster.SetAnnotations(annotations)
 
 		log.Info("Added fleet annotation to Rancher cluster")

Original file line number	Diff line number	Diff line change
`@@ -591,8 +591,8 @@ func (r *CAPIImportManagementV3Reconciler) optOutOfFleetManagement(ctx context.C`
`591`	`591`	`annotations = map[string]string{}`
`592`	`592`	`}`
`593`	`593`
`594`		`- if _, found := annotations[externalFleetAnnotation]; !found {`
`595`		`- annotations[externalFleetAnnotation] = trueValue`
	`594`	`+ if _, found := annotations[turtlesannotations.ExternalFleetAnnotation]; !found {`
	`595`	`+ annotations[turtlesannotations.ExternalFleetAnnotation] = trueValue`
`596`	`596`	`rancherCluster.SetAnnotations(annotations)`
`597`	`597`
`598`	`598`	`log.Info("Added fleet annotation to Rancher cluster")`