Rename orchestrator finalizer

bitpoke · May 10, 2019 · bfe4646 · bfe4646
1 parent 8a842a5
commit bfe4646
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/controller/orchestrator/orchestrator_controller.go b/pkg/controller/orchestrator/orchestrator_controller.go
@@ -52,7 +52,10 @@ const (
 
 	// OrchestratorFinalizer is set when the cluster is registered in
 	// orchestrator and is removed when no nodes are in orchestrator
-	OrchestratorFinalizer = "OrchestratorFinalizer"
+	OrchestratorFinalizer = "mysql.presslabs.org/registered-in-orchestrator"
+
+	// OldOrchestratorFinalizer is the old finalizer name that is DEPRECATED
+	OldOrchestratorFinalizer = "OrchestratorFinalizer"
 )
 
 var log = logf.Log.WithName(controllerName)

diff --git a/pkg/controller/orchestrator/orchestrator_syncers.go b/pkg/controller/orchestrator/orchestrator_syncers.go
@@ -35,6 +35,8 @@ func newFinalizerSyncer(c client.Client, scheme *runtime.Scheme, cluster *mysqlc
 
 		// always add finalizer, this action is idempotent
 		addFinalizer(out, OrchestratorFinalizer)
+		// TODO: remove this in next version
+		removeFinalizer(out, OldOrchestratorFinalizer)
 
 		// if cluster is deleted then check orchestrator status and remove finalizer if no node is in orchestrator
 		if out.DeletionTimestamp != nil {