Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-29975: Allow multiple machine networks #6071

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Prev Previous commit
Update comment on L2 connectivity checks and MachineNetworks
OpenShift has ~always supported having machines in multiple
machineNetworks, so update the TODO comment to reflect that accounting
for this is already something we need to do to fully support
non-UserManagedNetworking clusters. (UserManagedNetworking clusters use
only the L3 connectivity check.)

See https://issues.redhat.com/browse/OCPBUGS-30730 for more details.
  • Loading branch information
zaneb committed Dec 3, 2024
commit b9ba27b9569e9fe1aaa742754370d3745cebde7e
5 changes: 3 additions & 2 deletions internal/host/validator.go
Original file line number Diff line number Diff line change
@@ -675,8 +675,9 @@ func (v *validator) belongsToL2MajorityGroup(c *validationContext, majorityGroup
return ValidationFailure
}

// TODO(mko) This rule should be revised as soon as OCP supports multiple machineNetwork
// entries using the same IP stack.
// TODO(mko) This rule must be revised to support multiple machineNetwork
// entries using the same IP stack on clusters without
// user-managed networking. (OCPBUGS-30730)
areNetworksEqual := func(ipnet1, ipnet2 *net.IPNet) bool {
return ipnet1.IP.Equal(ipnet2.IP) && bytes.Equal(ipnet1.Mask, ipnet2.Mask)
}