github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29207 from fgrzadkowski/ha_master_leader_elect

Browse Source 
Automatic merge from submit-queue

Add default leader election for scheduler and controller manager.

#21124
This commit is contained in:
k8s-merge-robot 2016-07-22 04:49:44 -07:00 committed by GitHub
commit 6fd685b54b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-controller-manager/app/options/options.go
View File

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

1
plugin/cmd/kube-scheduler/app/options/options.go
View File

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