Merge pull request #1354 from vincepri/close-channel-after-runnables

🐛 Manager.Elected() should beclosed after runnables are started
kubernetes-sigs · Jan 21, 2021 · e1dbc44 · e1dbc44
2 parents ad68b43 + c9e1c10
commit e1dbc44
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go
@@ -483,8 +483,8 @@ func (cm *controllerManager) Start(ctx context.Context) (err error) {
 			}
 		} else {
 			// Treat not having leader election enabled the same as being elected.
+			cm.startLeaderElectionRunnables()
 			close(cm.elected)
-			go cm.startLeaderElectionRunnables()
 		}
 	}()
 
@@ -640,8 +640,8 @@ func (cm *controllerManager) startLeaderElection() (err error) {
 		RetryPeriod:   cm.retryPeriod,
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(_ context.Context) {
-				close(cm.elected)
 				cm.startLeaderElectionRunnables()
+				close(cm.elected)
 			},
 			OnStoppedLeading: cm.onStoppedLeading,
 		},