Merge pull request #1685 from stbenjam/fix-metal

Bug 1828106: cloudConfig: remove bare metal from platforms that require a cloud conifg
openshift · Apr 27, 2020 · eb5731a · eb5731a
2 parents cecd834 + 7c6e1ba
commit eb5731a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/controller/template/render.go b/pkg/controller/template/render.go
@@ -504,7 +504,7 @@ func cloudConfigFlag(cfg RenderConfig) interface{} {
 	}
 	flag := "--cloud-config=/etc/kubernetes/cloud.conf"
 	switch cfg.Platform {
-	case platformAWS, platformAzure, platformBaremetal, platformGCP, platformOpenStack, platformOvirt, platformVSphere:
+	case platformAWS, platformAzure, platformGCP, platformOpenStack, platformOvirt, platformVSphere:
 		return flag
 	default:
 		return ""

diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -102,7 +102,7 @@ func isCloudConfigRequired(infra *configv1.Infrastructure) bool {
 	if infra.Spec.CloudConfig.Name != "" {
 		return true
 	}
-	for _, platform := range []configv1.PlatformType{configv1.AzurePlatformType, configv1.BareMetalPlatformType, configv1.GCPPlatformType, configv1.OpenStackPlatformType,
+	for _, platform := range []configv1.PlatformType{configv1.AzurePlatformType, configv1.GCPPlatformType, configv1.OpenStackPlatformType,
 		configv1.OvirtPlatformType, configv1.VSpherePlatformType} {
 		if platform == infra.Status.PlatformStatus.Type {
 			return true