Merge pull request #1291 from ericavonb/bz-1776773-vsphere-provider

Bug 1777082: set vsphere as provider
openshift · Nov 28, 2019 · 37b2a19 · 37b2a19
2 parents a6a8632 + 3f3cf8e
commit 37b2a19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/controller/template/render.go b/pkg/controller/template/render.go
@@ -467,12 +467,10 @@ func etcdMetricCertCommand(cfg RenderConfig) (interface{}, error) {
 
 func cloudProvider(cfg RenderConfig) (interface{}, error) {
 	switch cfg.Platform {
-	case platformAWS, platformAzure, platformOpenStack:
+	case platformAWS, platformAzure, platformOpenStack, platformVSphere:
 		return cfg.Platform, nil
 	case platformGCP:
 		return "gce", nil
-	case platformVSphere:
-		return "", nil // kubelet crash errors when provider set to VSphere right now
 	default:
 		return "", nil
 	}

diff --git a/pkg/controller/template/render_test.go b/pkg/controller/template/render_test.go
@@ -43,6 +43,9 @@ func TestCloudProvider(t *testing.T) {
 	}, {
 		platform: "none",
 		res:      "",
+	}, {
+		platform: "vsphere",
+		res:      "vsphere",
 	}}
 	for idx, c := range cases {
 		name := fmt.Sprintf("case #%d", idx)