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

Merge pull request #84648 from neolit123/1.17-fix-reset-hang

Browse Source 
kubeadm: always use a short timeout for clientset creation
This commit is contained in:
Kubernetes Prow Robot 2019-11-10 04:25:39 -08:00 committed by GitHub
commit 2f3376e463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/util/kubeconfig/kubeconfig.go
View File

@ -80,7 +80,8 @@ func ClientSetFromFile(path string) (*clientset.Clientset, error) {
// ToClientSet converts a KubeConfig object to a client // ToClientSet converts a KubeConfig object to a client
func ToClientSet(config *clientcmdapi.Config) (*clientset.Clientset, error) { func ToClientSet(config *clientcmdapi.Config) (*clientset.Clientset, error) {
clientConfig, err := clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig() overrides := clientcmd.ConfigOverrides{Timeout: "10s"}
clientConfig, err := clientcmd.NewDefaultClientConfig(*config, &overrides).ClientConfig()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to create API client configuration from kubeconfig") return nil, errors.Wrap(err, "failed to create API client configuration from kubeconfig")
} }