Nutanix: support multi-subnets in Machine providerSpec

openshift · Oct 29, 2024 · f3b39e0 · f3b39e0
1 parent 08792a0
commit f3b39e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/types/nutanix/validation/platform.go b/pkg/types/nutanix/validation/platform.go
@@ -68,9 +68,8 @@ func ValidatePlatform(p *nutanix.Platform, fldPath *field.Path, c *types.Install
 		}
 	}
 
-	// Currently we only support one subnet for an OpenShift cluster
-	if len(p.SubnetUUIDs) != 1 || len(p.SubnetUUIDs[0]) == 0 {
-		allErrs = append(allErrs, field.Required(fldPath.Child("subnet"), "must specify the subnet"))
+	if len(p.SubnetUUIDs) == 0 || p.SubnetUUIDs[0] == "" {
+		allErrs = append(allErrs, field.Required(fldPath.Child("subnet"), "must specify at least one subnet"))
 	}
 
 	if c.Nutanix.LoadBalancer != nil {
@@ -95,8 +94,8 @@ func ValidatePlatform(p *nutanix.Platform, fldPath *field.Path, c *types.Install
 					allErrs = append(allErrs, field.Required(fldPath.Child("failureDomain", "prismElement", "uuid"), "failureDomain prismElement uuid cannot be empty"))
 				}
 
-				if len(fd.SubnetUUIDs) != 1 || p.SubnetUUIDs[0] == "" {
-					allErrs = append(allErrs, field.Invalid(fldPath.Child("failureDomain", "subnetUUIDs"), "", "must specify one failure domain subnet uuid"))
+				if len(fd.SubnetUUIDs) == 0 || p.SubnetUUIDs[0] == "" {
+					allErrs = append(allErrs, field.Invalid(fldPath.Child("failureDomain", "subnetUUIDs"), "", "must specify at least one failure domain subnet uuid"))
 				}
 
 				for _, sc := range fd.StorageContainers {

diff --git a/pkg/types/nutanix/validation/platform_test.go b/pkg/types/nutanix/validation/platform_test.go
@@ -147,7 +147,7 @@ func TestValidatePlatform(t *testing.T) {
 				p.SubnetUUIDs[0] = ""
 				return p
 			}(),
-			expectedError: `^test-path\.subnet: Required value: must specify the subnet$`,
+			expectedError: `^test-path\.subnet: Required value: must specify at least one subnet$`,
 		},
 		{
 			name: "Capital letters in Prism Central",