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

Merge pull request #29207 from fgrzadkowski/ha_master_leader_elect
6fd685b5 · k8s-merge-robot · GitHub · 60e59c94 · 69e97863 · 6fd685b5
Commit 6fd685b5 authored Jul 22, 2016 by k8s-merge-robot Committed by GitHub Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

options.go cmd/kube-controller-manager/app/options/options.go +1 -0

options.go plugin/cmd/kube-scheduler/app/options/options.go +1 -0

No files found.
--- a/cmd/kube-controller-manager/app/options/options.go
+++ b/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
 }


--- a/plugin/cmd/kube-scheduler/app/options/options.go
+++ b/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,
 	}