Merge pull request #37442 from NickrenREN/kubelet-run

Automatic merge from submit-queue (batch tested with PRs 37094, 37663, 37442, 37808, 37826) fix if condition question in kubelet run() function Here variable err returned by function NewForConfig(&eventClientConfig) if CreateAPIServerClientConfig() function runs correctly . And we should not print "invalid kubeconfig" info. Should we use else instead of if.

Merge pull request #37442 from NickrenREN/kubelet-run
caa935df · Kubernetes Submit Queue · GitHub · ba62dafe · 19c9860b · caa935df
Commit caa935df authored Dec 03, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

server.go cmd/kubelet/app/server.go +1 -2

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -392,8 +392,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
 			eventClientConfig.QPS = float32(s.EventRecordQPS)
 			eventClientConfig.Burst = int(s.EventBurst)
 			eventClient, err = clientset.NewForConfig(&eventClientConfig)
-		}
+		} else {
-		if err != nil {
 			if s.RequireKubeConfig {
 				return fmt.Errorf("invalid kubeconfig: %v", err)
 			}