github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98059 from jprzychodzen/ld-kcm

Browse Source 
[kube-controller-manager] Lower timeout for leaderelection resourcelock
This commit is contained in:
Kubernetes Prow Robot 2021-01-26 02:36:34 -08:00 committed by GitHub
commit 76d1292930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kube-controller-manager/app/config/config.go
View File

@ -40,9 +40,6 @@ type Config struct {
// the general kube client // the general kube client
Client *clientset.Clientset Client *clientset.Clientset
// the client only used for leader election
LeaderElectionClient *clientset.Clientset
// the rest config for the master // the rest config for the master
Kubeconfig *restclient.Config Kubeconfig *restclient.Config

8
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -270,15 +270,15 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
// add a uniquifier so that two processes on the same host don't accidentally both become active // add a uniquifier so that two processes on the same host don't accidentally both become active
id = id + "_" + string(uuid.NewUUID()) id = id + "_" + string(uuid.NewUUID())
rl, err := resourcelock.New(c.ComponentConfig.Generic.LeaderElection.ResourceLock, rl, err := resourcelock.NewFromKubeconfig(c.ComponentConfig.Generic.LeaderElection.ResourceLock,
c.ComponentConfig.Generic.LeaderElection.ResourceNamespace, c.ComponentConfig.Generic.LeaderElection.ResourceNamespace,
c.ComponentConfig.Generic.LeaderElection.ResourceName, c.ComponentConfig.Generic.LeaderElection.ResourceName,
c.LeaderElectionClient.CoreV1(),
c.LeaderElectionClient.CoordinationV1(),
resourcelock.ResourceLockConfig{ resourcelock.ResourceLockConfig{
Identity: id, Identity: id,
EventRecorder: c.EventRecorder, EventRecorder: c.EventRecorder,
}) },
c.Kubeconfig,
c.ComponentConfig.Generic.LeaderElection.RenewDeadline.Duration)
if err != nil { if err != nil {
klog.Fatalf("error creating lock: %v", err) klog.Fatalf("error creating lock: %v", err)
} }

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

@ -441,18 +441,12 @@ func (s KubeControllerManagerOptions) Config(allControllers []string, disabledBy
return nil, err return nil, err
} }
// shallow copy, do not modify the kubeconfig.Timeout.
config := *kubeconfig
config.Timeout = s.Generic.LeaderElection.RenewDeadline.Duration
leaderElectionClient := clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "leader-election"))
eventRecorder := createRecorder(client, KubeControllerManagerUserAgent) eventRecorder := createRecorder(client, KubeControllerManagerUserAgent)
c := &kubecontrollerconfig.Config{ c := &kubecontrollerconfig.Config{
Client: client, Client: client,
Kubeconfig: kubeconfig, Kubeconfig: kubeconfig,
EventRecorder: eventRecorder, EventRecorder: eventRecorder,
LeaderElectionClient: leaderElectionClient,
} }
if err := s.ApplyTo(c); err != nil { if err := s.ApplyTo(c); err != nil {
return nil, err return nil, err