From 7c6e1ba9dbcec56f02f13b071664e160d9552b16 Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Sun, 26 Apr 2020 20:24:26 -0400 Subject: [PATCH] cloudConfig: remove bare metal from platforms that require a cloud config Baremetal IPI doesn't use a cloud config, and this change is now breaking CI: ``` level=error msg="Cluster operator machine-config Degraded is True with RenderConfigFailed: Unable to apply 0.0.1-2020-04-26-200215: openshift-config-managed/kube-cloud-config configmap is required on platform BareMetal but not found: configmap \"kube-cloud-config\" not found" ``` --- pkg/controller/template/render.go | 2 +- pkg/operator/sync.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/template/render.go b/pkg/controller/template/render.go index 98ea8ca188..0b2dc69cde 100644 --- 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 index c48db1f3a0..1fe10b950b 100644 --- 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