Merge pull request #29254 from ping035627/ping035627-patch-0718

Automatic merge from submit-queue Judge the cloud isn't nil before use it in server.go The PR add a judgement for the cloud before use it, because cloudprovider.InitCloudProvider maybe return nil for the cloud.

Merge pull request #29254 from ping035627/ping035627-patch-0718
50643068 · k8s-merge-robot · GitHub · 9045dfef · a7d3c73b · 50643068
Commit 50643068 authored Jul 27, 2016 by k8s-merge-robot Committed by GitHub Jul 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

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

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -348,8 +348,12 @@ func run(s *options.KubeletServer, kcfg *KubeletConfig) (err error) {
 			if err != nil {
 				return err
 			}
-			glog.V(2).Infof("Successfully initialized cloud provider: %q from the config file: %q\n", s.CloudProvider, s.CloudConfigFile)
+			if cloud == nil {
-			kcfg.Cloud = cloud
+				glog.V(2).Infof("No cloud provider specified: %q from the config file: %q\n", s.CloudProvider, s.CloudConfigFile)
+			} else {
+				glog.V(2).Infof("Successfully initialized cloud provider: %q from the config file: %q\n", s.CloudProvider, s.CloudConfigFile)
+				kcfg.Cloud = cloud
+			}
 		}
 	}