Merge pull request #56410 from stewart-yu/cloudeprovider-fixcloudnil

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. If cloud==nil, it should exits to avoid Panic **What this PR does / why we need it**: If `cloud == nil`， it should exits, otherwise `cloud.HasClusterID()` will panic. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56410 from stewart-yu/cloudeprovider-fixcloudnil
e1ee105b · Kubernetes Submit Queue · GitHub · 88ae1ef5 · eed826a2 · e1ee105b
Unverified Commit e1ee105b authored Dec 16, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

controllermanager.go cmd/cloud-controller-manager/app/controllermanager.go +4 -0

No files found.
--- a/cmd/cloud-controller-manager/app/controllermanager.go
+++ b/cmd/cloud-controller-manager/app/controllermanager.go
@@ -93,6 +93,10 @@ func Run(s *options.CloudControllerManagerServer) error {
 		glog.Fatalf("Cloud provider could not be initialized: %v", err)
 	}

+	if cloud == nil {
+		glog.Fatalf("cloud provider is nil")
+	}
+
 	if cloud.HasClusterID() == false {
 		if s.AllowUntaggedCloud == true {
 			glog.Warning("detected a cluster without a ClusterID.  A ClusterID will be required in the future.  Please tag your cluster to avoid any future issues")