Skip to content

MGMT-21625: Add Dual-Stack with Primary IPv6 Support #3190

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 1 commit into from
Oct 21, 2025
Merged

MGMT-21625: Add Dual-Stack with Primary IPv6 Support #3190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
275 changes: 275 additions & 0 deletions libs/ui-lib/lib/common/components/clusterConfiguration/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
import { test, describe, expect } from 'vitest';
import { isDualStack } from './utils';
import {
MachineNetwork,
ClusterNetwork,
ServiceNetwork,
} from '@openshift-assisted/types/assisted-installer-service';

describe('isDualStack', () => {
const createMachineNetwork = (cidr: string): MachineNetwork => ({ cidr, clusterId: 'test' });
const createClusterNetwork = (cidr: string, hostPrefix: number): ClusterNetwork => ({
cidr,
hostPrefix,
clusterId: 'test',
});
const createServiceNetwork = (cidr: string): ServiceNetwork => ({ cidr, clusterId: 'test' });

describe('OCP < 4.12 (legacy behavior)', () => {
test('returns true for valid dual stack with IPv4 primary', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('192.168.1.0/24'),
createMachineNetwork('2001:db8::/64'),
],
clusterNetworks: [
createClusterNetwork('10.128.0.0/14', 23),
createClusterNetwork('fd01::/48', 64),
],
serviceNetworks: [
createServiceNetwork('172.30.0.0/16'),
createServiceNetwork('fd02::/112'),
],
openshiftVersion: '4.11',
});

expect(result).toBe(true);
});

test('returns false for IPv6 primary in OCP < 4.12', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('2001:db8::/64'),
createMachineNetwork('192.168.1.0/24'),
],
clusterNetworks: [
createClusterNetwork('fd01::/48', 64),
createClusterNetwork('10.128.0.0/14', 23),
],
serviceNetworks: [
createServiceNetwork('fd02::/112'),
createServiceNetwork('172.30.0.0/16'),
],
openshiftVersion: '4.11',
});

expect(result).toBe(false);
});

test('returns false for single stack', () => {
const result = isDualStack({
machineNetworks: [createMachineNetwork('192.168.1.0/24')],
clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
openshiftVersion: '4.11',
});

expect(result).toBe(false);
});

test('returns false for empty networks', () => {
const result = isDualStack({
machineNetworks: [],
clusterNetworks: [],
serviceNetworks: [],
openshiftVersion: '4.11',
});

expect(result).toBe(false);
});
});

describe('OCP >= 4.12 (new behavior)', () => {
test('returns true for IPv4 primary and IPv6 secondary', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('192.168.1.0/24'),
createMachineNetwork('2001:db8::/64'),
],
clusterNetworks: [
createClusterNetwork('10.128.0.0/14', 23),
createClusterNetwork('fd01::/48', 64),
],
serviceNetworks: [
createServiceNetwork('172.30.0.0/16'),
createServiceNetwork('fd02::/112'),
],
openshiftVersion: '4.12',
});

expect(result).toBe(true);
});

test('returns true for IPv6 primary and IPv4 secondary', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('2001:db8::/64'),
createMachineNetwork('192.168.1.0/24'),
],
clusterNetworks: [
createClusterNetwork('fd01::/48', 64),
createClusterNetwork('10.128.0.0/14', 23),
],
serviceNetworks: [
createServiceNetwork('fd02::/112'),
createServiceNetwork('172.30.0.0/16'),
],
openshiftVersion: '4.12',
});

expect(result).toBe(true);
});

test('returns false for IPv6 primary and IPv6 secondary (not dual-stack)', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('2001:db8::/64'),
createMachineNetwork('2001:db9::/64'),
],
clusterNetworks: [
createClusterNetwork('fd01::/48', 64),
createClusterNetwork('fd02::/48', 64),
],
serviceNetworks: [createServiceNetwork('fd03::/112'), createServiceNetwork('fd04::/112')],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});

test('returns false for IPv4 primary and IPv4 secondary (not dual-stack)', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('192.168.1.0/24'),
createMachineNetwork('10.0.0.0/24'),
],
clusterNetworks: [
createClusterNetwork('10.128.0.0/14', 23),
createClusterNetwork('172.16.0.0/14', 23),
],
serviceNetworks: [
createServiceNetwork('172.30.0.0/16'),
createServiceNetwork('172.31.0.0/16'),
],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});

test('returns false for single stack', () => {
const result = isDualStack({
machineNetworks: [createMachineNetwork('192.168.1.0/24')],
clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});

test('returns false if any network type is not dual stack', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('192.168.1.0/24'),
createMachineNetwork('2001:db8::/64'),
],
clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)], // Single stack
serviceNetworks: [
createServiceNetwork('172.30.0.0/16'),
createServiceNetwork('fd02::/112'),
],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});
});

describe('no version specified (defaults to legacy behavior)', () => {
test('returns true for IPv4 primary and IPv6 secondary', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('192.168.1.0/24'),
createMachineNetwork('2001:db8::/64'),
],
clusterNetworks: [
createClusterNetwork('10.128.0.0/14', 23),
createClusterNetwork('fd01::/48', 64),
],
serviceNetworks: [
createServiceNetwork('172.30.0.0/16'),
createServiceNetwork('fd02::/112'),
],
});

expect(result).toBe(true);
});

test('returns false for IPv6 primary when no version specified', () => {
const result = isDualStack({
machineNetworks: [
createMachineNetwork('2001:db8::/64'),
createMachineNetwork('192.168.1.0/24'),
],
clusterNetworks: [
createClusterNetwork('fd01::/48', 64),
createClusterNetwork('10.128.0.0/14', 23),
],
serviceNetworks: [
createServiceNetwork('fd02::/112'),
createServiceNetwork('172.30.0.0/16'),
],
});

expect(result).toBe(false);
});
});

describe('edge cases', () => {
test('handles undefined networks', () => {
const result = isDualStack({
machineNetworks: undefined,
clusterNetworks: undefined,
serviceNetworks: undefined,
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});

test('handles networks with empty CIDRs', () => {
const result = isDualStack({
machineNetworks: [
{ cidr: '', clusterId: 'test' },
{ cidr: '', clusterId: 'test' },
],
clusterNetworks: [
{ cidr: '', hostPrefix: 23, clusterId: 'test' },
{ cidr: '', hostPrefix: 64, clusterId: 'test' },
],
serviceNetworks: [
{ cidr: '', clusterId: 'test' },
{ cidr: '', clusterId: 'test' },
],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});

test('handles invalid CIDRs', () => {
const result = isDualStack({
machineNetworks: [createMachineNetwork('invalid'), createMachineNetwork('also-invalid')],
clusterNetworks: [
createClusterNetwork('invalid', 23),
createClusterNetwork('also-invalid', 64),
],
serviceNetworks: [createServiceNetwork('invalid'), createServiceNetwork('also-invalid')],
openshiftVersion: '4.12',
});

expect(result).toBe(false);
});
});
});
37 changes: 28 additions & 9 deletions libs/ui-lib/lib/common/components/clusterConfiguration/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
ServiceNetwork,
} from '@openshift-assisted/types/assisted-installer-service';
import { NO_SUBNET_SET } from '../../config';
import { isMajorMinorVersionEqualOrGreater } from '../../utils';
import {
selectClusterNetworkCIDR,
selectClusterNetworkHostPrefix,
Expand Down Expand Up @@ -179,20 +180,38 @@ export const canBeDualStack = (subnets: HostSubnets) =>

const areNetworksDualStack = (
networks: (MachineNetwork | ClusterNetwork | ServiceNetwork)[] | undefined,
) =>
networks &&
networks.length > 1 &&
Address4.isValid(networks[0].cidr || '') &&
Address6.isValid(networks[1].cidr || '');
openshiftVersion?: string,
) => {
if (!networks || networks.length < 2) {
return false;
}

const firstCidr = networks[0].cidr || '';
const secondCidr = networks[1].cidr || '';

// For OCP >= 4.12, allow either IPv4 or IPv6 as primary, with opposite as secondary
if (openshiftVersion && isMajorMinorVersionEqualOrGreater(openshiftVersion, '4.12')) {
return (
(Address4.isValid(firstCidr) && Address6.isValid(secondCidr)) ||
(Address6.isValid(firstCidr) && Address4.isValid(secondCidr))
);
}

// For older versions, require IPv4 as primary and IPv6 as secondary
return Address4.isValid(firstCidr) && Address6.isValid(secondCidr);
};

export const isDualStack = ({
machineNetworks,
clusterNetworks,
serviceNetworks,
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks'>) =>
areNetworksDualStack(machineNetworks) &&
areNetworksDualStack(clusterNetworks) &&
areNetworksDualStack(serviceNetworks);
openshiftVersion,
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks'> & {
openshiftVersion?: string;
}) =>
areNetworksDualStack(machineNetworks, openshiftVersion) &&
areNetworksDualStack(clusterNetworks, openshiftVersion) &&
areNetworksDualStack(serviceNetworks, openshiftVersion);

export const isSubnetInIPv6 = ({
clusterNetworkCidr,
Expand Down
Loading
Loading