Merge pull request #29207 from fgrzadkowski/ha_master_leader_elect

Automatic merge from submit-queue

Add default leader election for scheduler and controller manager.

#21124

cmd/kube-controller-manager/app/options/options.go

@@ -97,6 +97,7 @@ func NewCMServer() *CMServer {
 			ClusterSigningKeyFile:   "/etc/kubernetes/ca/ca.key",
 		},
 	}
+	s.LeaderElection.LeaderElect = true
 	return &s
 }
 

plugin/cmd/kube-scheduler/app/options/options.go

@@ -42,6 +42,7 @@ type SchedulerServer struct {
 func NewSchedulerServer() *SchedulerServer {
 	config := componentconfig.KubeSchedulerConfiguration{}
 	api.Scheme.Convert(&v1alpha1.KubeSchedulerConfiguration{}, &config)
+	config.LeaderElection.LeaderElect = true
 	s := SchedulerServer{
 		KubeSchedulerConfiguration: config,
 	}