Merge pull request #107 from shiftstack/fix-port-security

OCPBUGS-30855: Ensure portSecurity is correctly set in the Port
openshift · Mar 13, 2024 · bf45c1f · bf45c1f
2 parents d1d44b4 + 555ef8d
commit bf45c1f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/machine/convert.go b/pkg/machine/convert.go
@@ -355,12 +355,18 @@ func MachineToInstanceSpec(machine *machinev1beta1.Machine, apiVIPs, ingressVIPs
 		if port.SecurityGroups != nil {
 			portSecurityGroupParams = securityGroupsToSecurityGroupParams(*port.SecurityGroups)
 		}
+		disablePortSecurity := port.PortSecurity
+		if disablePortSecurity != nil {
+			ps := !*disablePortSecurity
+			disablePortSecurity = &ps
+		}
 		capoPort := capov1.PortOpts{
 			Network:              &capov1.NetworkFilter{ID: port.NetworkID},
 			NameSuffix:           port.NameSuffix,
 			Description:          port.Description,
 			AdminStateUp:         port.AdminStateUp,
 			MACAddress:           port.MACAddress,
+			DisablePortSecurity:  disablePortSecurity,
 			FixedIPs:             make([]capov1.FixedIP, len(port.FixedIPs)),
 			SecurityGroupFilters: securityGroupParamToCapov1SecurityGroupFilter(portSecurityGroupParams),
 			VNICType:             port.VNICType,