Make leader election lease duration configurable through manager options

Author: vikaschoudhary16

pkg/leaderelection/leader_election.go

@@ -43,6 +43,16 @@ type Options struct {
 	// LeaderElectionID determines the name of the configmap that leader election
 	// will use for holding the leader lock.
 	LeaderElectionID string
+
+	// LeaseDurationSeconds is the duration that non-leader candidates will
+	// wait to force acquire leadership.
+	LeaseDurationSeconds int
+	// RenewDeadlineSeconds is the duration that the acting master will retry
+	// refreshing leadership before giving up.
+	RenewDeadlineSeconds int
+	// RetryPeriodSeconds is the duration the LeaderElector clients should wait
+	// between tries of actions.
+	RetryPeriodSeconds int
 }
 
 // NewResourceLock creates a new config map resource lock for use in a leader
@@ -85,8 +95,11 @@ func NewResourceLock(config *rest.Config, recorderProvider recorder.Provider, op
 		options.LeaderElectionID,
 		client.CoreV1(),
 		resourcelock.ResourceLockConfig{
-			Identity:      id,
-			EventRecorder: recorderProvider.GetEventRecorderFor(id),
+			Identity:             id,
+			LeaseDurationSeconds: options.LeaseDurationSeconds,
+			RenewDeadlineSeconds: options.RenewDeadlineSeconds,
+			RetryPeriodSeconds:   options.RetryPeriodSeconds,
+			EventRecorder:        recorderProvider.GetEventRecorderFor(id),
 		})
 }
 

pkg/manager/internal.go

@@ -40,6 +40,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
+const (
+	// Values taken from: https://github.com/kubernetes/apiserver/blob/master/pkg/apis/config/v1alpha1/defaults.go
+	defaultLeaseDuration = 15
+	defaultRenewDeadline = 10
+	defaultRetryPeriod   = 2
+)
+
 var log = logf.RuntimeLog.WithName("manager")
 
 type controllerManager struct {
@@ -286,13 +293,29 @@ func (cm *controllerManager) start() {
 }
 
 func (cm *controllerManager) startLeaderElection() (err error) {
+
+	var leaseDuration, renewDeadline, retryPeriod int
+	pLeaseDuration, pRenewDeadline, pRetryPeriod := cm.resourceLock.LeaderElectionConfig()
+	if pLeaseDuration == nil || *pLeaseDuration == 0 {
+		leaseDuration = defaultLeaseDuration
+	} else {
+		leaseDuration = *pLeaseDuration
+	}
+	if pRenewDeadline == nil || *pRenewDeadline == 0 {
+		renewDeadline = defaultRenewDeadline
+	} else {
+		renewDeadline = *pRenewDeadline
+	}
+	if pRetryPeriod == nil || *pRetryPeriod == 0 {
+		retryPeriod = defaultRetryPeriod
+	} else {
+		retryPeriod = *pRetryPeriod
+	}
 	l, err := leaderelection.NewLeaderElector(leaderelection.LeaderElectionConfig{
-		Lock: cm.resourceLock,
-		// Values taken from: https://github.com/kubernetes/apiserver/blob/master/pkg/apis/config/v1alpha1/defaults.go
-		// TODO(joelspeed): These timings should be configurable
-		LeaseDuration: 15 * time.Second,
-		RenewDeadline: 10 * time.Second,
-		RetryPeriod:   2 * time.Second,
+		Lock:          cm.resourceLock,
+		LeaseDuration: time.Duration(leaseDuration) * time.Second,
+		RenewDeadline: time.Duration(renewDeadline) * time.Second,
+		RetryPeriod:   time.Duration(retryPeriod) * time.Second,
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(_ context.Context) {
 				cm.start()

pkg/manager/manager.go

@@ -113,6 +113,17 @@ type Options struct {
 	// will use for holding the leader lock.
 	LeaderElectionID string
 
+	// LeaseDuration is the duration that non-leader candidates will
+	// wait to force acquire leadership. This is measured against time of
+	// last observed ack.
+	LeaseDurationSeconds int
+	// RenewDeadline is the duration that the acting master will retry
+	// refreshing leadership before giving up.
+	RenewDeadlineSeconds int
+	// RetryPeriod is the duration the LeaderElector clients should wait
+	// between tries of actions.
+	RetryPeriodSeconds int
+
 	// Namespace if specified restricts the manager's cache to watch objects in
 	// the desired namespace Defaults to all namespaces
 	//
@@ -217,6 +228,9 @@ func New(config *rest.Config, options Options) (Manager, error) {
 		LeaderElection:          options.LeaderElection,
 		LeaderElectionID:        options.LeaderElectionID,
 		LeaderElectionNamespace: options.LeaderElectionNamespace,
+		LeaseDurationSeconds:    options.LeaseDurationSeconds,
+		RenewDeadlineSeconds:    options.RenewDeadlineSeconds,
+		RetryPeriodSeconds:      options.RetryPeriodSeconds,
 	})
 	if err != nil {
 		return nil, err