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

k8s-ci-robot · web-flow · commit 2f3376e4632a · 2019-11-10T04:25:39.000-08:00
kubeadm: always use a short timeout for clientset creation
diff --git a/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go
@@ -80,7 +80,8 @@ func ClientSetFromFile(path string) (*clientset.Clientset, error) {
 
 // ToClientSet converts a KubeConfig object to a client
 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 {
 		return nil, errors.Wrap(err, "failed to create API client configuration from kubeconfig")
 	}

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