Merge pull request #9081 from shiftstack/mtu-validation-fix

OCPBUGS-41785: Validate MTU when controlPlanePort uses FixedIPs
openshift · Oct 8, 2024 · e61b787 · e61b787
2 parents 7534652 + 3ab8bca
commit e61b787
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkg/asset/installconfig/openstack/validation/cloudinfo.go b/pkg/asset/installconfig/openstack/validation/cloudinfo.go
@@ -380,11 +380,15 @@ func (ci *CloudInfo) getNetwork(ctx context.Context, controlPlanePort *openstack
 	networkName := controlPlanePort.Network.Name
 	networkID := controlPlanePort.Network.ID
 	if networkName == "" && networkID == "" {
-		return nil, nil
+		if len(ci.ControlPlanePortSubnets) > 0 && ci.ControlPlanePortSubnets[0].NetworkID != "" {
+			networkID = ci.ControlPlanePortSubnets[0].NetworkID
+		} else {
+			return nil, nil
+		}
 	}
 	opts := networks.ListOpts{}
 	if networkID != "" {
-		opts.ID = controlPlanePort.Network.ID
+		opts.ID = networkID
 	}
 	if networkName != "" {
 		opts.Name = controlPlanePort.Network.Name

diff --git a/pkg/asset/installconfig/openstack/validation/platform.go b/pkg/asset/installconfig/openstack/validation/platform.go
@@ -97,9 +97,9 @@ func validateControlPlanePort(p *openstack.Platform, n *types.Networking, ci *Cl
 		} else if ci.ControlPlanePortNetwork.ID != networkID {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("controlPlanePort").Child("network"), networkDetail, "network must contain subnets"))
 		}
-		if hasIPv6Subnet && ci.ControlPlanePortNetwork.MTU < minimumMTUv6 {
-			allErrs = append(allErrs, field.InternalError(fldPath.Child("controlPlanePort").Child("network"), fmt.Errorf("network should have an MTU of at least %d", minimumMTUv6)))
-		}
+	}
+	if hasIPv6Subnet && ci.ControlPlanePortNetwork != nil && ci.ControlPlanePortNetwork.MTU < minimumMTUv6 {
+		allErrs = append(allErrs, field.InternalError(fldPath.Child("controlPlanePort").Child("network"), fmt.Errorf("network should have an MTU of at least %d", minimumMTUv6)))
 	}
 	return allErrs
 }