github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99358 from p0lyn0mial/kcm-timeout

Browse Source 
KCM: specifies the upper-bound timeout limit for outgoing requests
This commit is contained in:
Kubernetes Prow Robot 2021-04-08 14:28:07 -07:00 committed by GitHub
commit c94a2f75e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ package options
import ( import (
"fmt" "fmt"
"net" "net"
"time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
@ -434,6 +435,7 @@ func (s KubeControllerManagerOptions) Config(allControllers []string, disabledBy
kubeconfig.ContentConfig.ContentType = s.Generic.ClientConnection.ContentType kubeconfig.ContentConfig.ContentType = s.Generic.ClientConnection.ContentType
kubeconfig.QPS = s.Generic.ClientConnection.QPS kubeconfig.QPS = s.Generic.ClientConnection.QPS
kubeconfig.Burst = int(s.Generic.ClientConnection.Burst) kubeconfig.Burst = int(s.Generic.ClientConnection.Burst)
kubeconfig.Timeout = 70 * time.Second // slightly bigger than the default server timeout which is 60 seconds
client, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, KubeControllerManagerUserAgent)) client, err := clientset.NewForConfig(restclient.AddUserAgent(kubeconfig, KubeControllerManagerUserAgent))
if err != nil { if err != nil {