Add support for no failure domains in OpenStack platform

openshift · Jun 28, 2023 · e9c1526 · e9c1526
1 parent 6239d9b
commit e9c1526
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/controllers/controlplanemachinesetgenerator/controller_test.go b/pkg/controllers/controlplanemachinesetgenerator/controller_test.go
@@ -2235,7 +2235,11 @@ var _ = Describe("controlplanemachinesetgenerator controller on OpenStack", func
 			Zone: "cinder-az5",
 		})
 
-		cpmsNoFailureDomainsBuilderOpenStack = machinev1.FailureDomains{}
+		cpmsEmptyFailureDomainsBuilderOpenStack = machinev1.FailureDomains{}
+
+		cpmsNoFailureDomainsBuilderOpenStack = machinev1.FailureDomains{
+			Platform: "",
+		}
 
 		cpms3FailureDomainsBuilderOpenStack = machinev1resourcebuilder.OpenStackFailureDomains().WithFailureDomainBuilders(
 			az1FailureDomainBuilderOpenStack,
@@ -2550,6 +2554,7 @@ var _ = Describe("controlplanemachinesetgenerator controller on OpenStack", func
 					By("Checking the Control Plane Machine Set has been created")
 					Eventually(komega.Get(cpms)).Should(Succeed())
 
+					Expect(cpms.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains).To(Equal(cpmsEmptyFailureDomainsBuilderOpenStack))
 					Expect(cpms.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains).To(Equal(cpmsNoFailureDomainsBuilderOpenStack))
 				})
 

diff --git a/pkg/controllers/controlplanemachinesetgenerator/utils.go b/pkg/controllers/controlplanemachinesetgenerator/utils.go
@@ -201,7 +201,7 @@ func buildFailureDomains(logger logr.Logger, machineSets []machinev1beta1.Machin
 			return nil, fmt.Errorf("failed to build OpenStack failure domains: %w", err)
 		}
 
-		if cpmsFailureDomain.OpenStack == nil {
+		if cpmsFailureDomain.OpenStack == nil || cpmsFailureDomain.Platform == "" {
 			return nil, nil //nolint:nilnil
 		}
 	default: