Merge pull request #29650 from ping035627/ping035627-patch-0727

Automatic merge from submit-queue Add error log for clientset.NewForConfig Deal with the CreateAPIServerClientConfig return, when s.APIServerList == 0, CreateAPIServerClientConfig return error, and on the origin way the err perhaps has been rewrited by clientset.NewForConfig(&eventClientConfig).

Merge pull request #29650 from ping035627/ping035627-patch-0727
66201fa7 · Kubernetes Submit Queue · GitHub · 0f14ede4 · fa5c4966 · 66201fa7
Commit 66201fa7 authored Sep 12, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

server.go cmd/kubelet/app/server.go +3 -0

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -369,6 +369,9 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
 		clientConfig, err := CreateAPIServerClientConfig(s)
 		if err == nil {
 			kubeClient, err = clientset.NewForConfig(clientConfig)
+			if err != nil {
+				glog.Warningf("New kubeClient from clientConfig error: %v", err)
+			}
 			// make a separate client for events
 			eventClientConfig := *clientConfig
 			eventClientConfig.QPS = float32(s.EventRecordQPS)