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 12 commits into
base: master
Choose a base branch
from

Commits on Mar 10, 2024

  1. Fix typo in function name

    zaneb committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    715cc3e View commit details
    Browse the repository at this point in the history
  2. Refactor GetMachineNetworkForUserManagedNetworking()

    It's confusing that GetMachineNetworksFromBootstrapHost() returns the
    existing MachineNetworks in the cluster (and does *not* get them from
    the bootstrap host) if they already exist there. Refactor to make the
    logic clearer.
    zaneb committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    2503b6b View commit details
    Browse the repository at this point in the history
  3. Use plural in function name

    zaneb committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    c409fe6 View commit details
    Browse the repository at this point in the history
  4. Remove redundant code

    The network type is set for all platforms in getBasicInstallConfig().
    There is no need to set it again in the none platform provider.
    zaneb committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    7f35e9f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1232119 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. MGMT-7587: Check all networks for CIDR overlap

    None of the subnets specified in any of the machineNetworks,
    clusterNetworks, or serviceNetworks should overlap. Validate all of
    these combinations, as openshift-installer does, instead of making
    assumptions about indices being aligned to address families.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    51e76b1 View commit details
    Browse the repository at this point in the history
  2. Validate VIPs against all MachineNetworks

    Don't make assumptions about a 1:1 mapping between MachineNetworks and
    VIPs.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7d1ac38 View commit details
    Browse the repository at this point in the history
  3. Allow host to be in any MachineNetwork

    In the belongs-to-machine-cidr validation, allow the host to be a member
    of any MachineNetwork. In a dual-stack cluster, require it to be a
    member of both an IPv4 and an IPv6 network.
    
    Previously it was assumed that the only reason for multiple
    MachineNetworks to appear was that a dual stack cluster could contain
    exactly one IPv4 and one IPv6 MachineNetwork.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c595634 View commit details
    Browse the repository at this point in the history
  4. Allow multiple MachineNetworks in dual stack

    Multiple MachineNetworks in the same address family and IPv6-primary
    dual-stack clusters are a thing, so relax the dual-stack validation
    requirements for machine networks to allow them.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    41e0cbd View commit details
    Browse the repository at this point in the history
  5. Revert "Forbid multiple machine networks in single-stack clusters"

    Allow users to specify multiple machine networks of the same address
    family. This is a documented and supported feature of OpenShift.
    
    This reverts commit 873dd81.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bae9303 View commit details
    Browse the repository at this point in the history
  6. Find BootMACAddress from any machine network

    Don't restrict ourselves to the first machine networking when looking
    for an interface on a machine network to set the BootMACAddress.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    f8bcf77 View commit details
    Browse the repository at this point in the history
  7. 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.
    zaneb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ff9be84 View commit details
    Browse the repository at this point in the history