fix(controller): Leader lease shared name improvments (#5218)

Signed-off-by: Zach Aller <zachaller@hotmail.com>
argoproj · Feb 26, 2021 · d7dc48c · d7dc48c
1 parent 2d2fba3
commit d7dc48c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/workflow/controller/controller.go b/workflow/controller/controller.go
@@ -217,15 +217,15 @@ func (wfc *WorkflowController) Run(ctx context.Context, wfWorkers, workflowTTLWo
 	}
 	logCtx := log.WithField("id", nodeID)
 
-	instanceID := "default-instance-id"
+	leaderName := "workflow-controller"
 	if wfc.Config.InstanceID != "" {
-		instanceID = wfc.Config.InstanceID
+		leaderName = fmt.Sprintf("%s-%s", leaderName, wfc.Config.InstanceID)
 	}
 
 	var cancel context.CancelFunc
 	go leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{
 		Lock: &resourcelock.LeaseLock{
-			LeaseMeta: metav1.ObjectMeta{Name: instanceID, Namespace: wfc.namespace}, Client: wfc.kubeclientset.CoordinationV1(),
+			LeaseMeta: metav1.ObjectMeta{Name: leaderName, Namespace: wfc.namespace}, Client: wfc.kubeclientset.CoordinationV1(),
 			LockConfig: resourcelock.ResourceLockConfig{Identity: nodeID, EventRecorder: wfc.eventRecorderManager.Get(wfc.namespace)},
 		},
 		ReleaseOnCancel: true,