Merge pull request #4917 from shiftstack/BZ_1957809

Bug 1957809: Validation of platform.openstack.machineSubnet
openshift · May 11, 2021 · f7170a4 · f7170a4
2 parents c018bd4 + 8abc715
commit f7170a4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/asset/installconfig/openstack/validation/platform.go b/pkg/asset/installconfig/openstack/validation/platform.go
@@ -38,7 +38,9 @@ func validateMachinesSubnet(p *openstack.Platform, n *types.Networking, ci *Clou
 		if len(p.ExternalDNS) > 0 {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("externalDNS"), p.ExternalDNS, "externalDNS is set, externalDNS is not supported when machinesSubnet is set"))
 		}
-		if !validUUIDv4(p.MachinesSubnet) {
+		if ci.MachinesSubnet == nil {
+			allErrs = append(allErrs, field.NotFound(fldPath.Child("machinesSubnet"), p.MachinesSubnet))
+		} else if !validUUIDv4(p.MachinesSubnet) {
 			allErrs = append(allErrs, field.InternalError(fldPath.Child("machinesSubnet"), errors.New("invalid subnet ID")))
 		} else {
 			if n.MachineNetwork[0].CIDR.String() != ci.MachinesSubnet.CIDR {