Skip to content

[releases/v2.47] MGMT-22119: Solving errors with SNO dual-stack #3252

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 2 commits into from
Nov 11, 2025
Merged

[releases/v2.47] MGMT-22119: Solving errors with SNO dual-stack #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8669a84
Solving errors with SNO dual-stack
ammont82 Nov 6, 2025
9c962f5
Solving errors when change between dual-stack and single-stack
ammont82 Nov 7, 2025
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
28 changes: 25 additions & 3 deletions .../ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,12 @@ export const StackTypeControlGroup = ({
const setSingleStack = React.useCallback(() => {
setFieldValue('stackType', IPV4_STACK);

// Determine whether the first machine network is IPv4
const firstNetwork = values.machineNetworks?.[0];
const isFirstIPv4 = Boolean(firstNetwork?.cidr && Address4.isValid(firstNetwork.cidr));

if (values.machineNetworks && values.machineNetworks?.length >= 2) {
// For single-stack IPv4, prefer IPv4 machine network
const firstNetwork = values.machineNetworks[0];
const isFirstIPv4 = firstNetwork?.cidr && Address4.isValid(firstNetwork.cidr);

if (isFirstIPv4) {
// Keep the first network if it's IPv4
setFieldValue('machineNetworks', [firstNetwork]);
Expand Down Expand Up @@ -123,6 +124,24 @@ export const StackTypeControlGroup = ({
setFieldValue('serviceNetworks', [ipv4Service]);
}

// Keep only IPv4 VIPs when switching to single-stack (unless DHCP allocation is used)
if (!values.vipDhcpAllocation) {
const pruneVips = (
vips?: { ip?: string; clusterId?: Cluster['id'] }[],
): { ip: string; clusterId: Cluster['id'] }[] => {
if (!vips || vips.length === 0) return [];
// Choose which index to keep based on whether the first network is IPv4
const keepIndex = isFirstIPv4 ? 0 : 1;
const chosen = vips[keepIndex];
return chosen && chosen.ip
? [{ ip: chosen.ip, clusterId: chosen.clusterId || clusterId }]
: [];
};

setFieldValue('apiVips', pruneVips(values.apiVips));
setFieldValue('ingressVips', pruneVips(values.ingressVips));
}

void validateForm();
}, [
setFieldValue,
Expand All @@ -133,6 +152,9 @@ export const StackTypeControlGroup = ({
values.clusterNetworks,
values.machineNetworks,
values.serviceNetworks,
values.apiVips,
values.ingressVips,
values.vipDhcpAllocation,
]);

const setDualStack = () => {
Expand Down
18 changes: 5 additions & 13 deletions ...cm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,9 @@ export const getNetworkConfigurationValidationSchema = (
hostSubnets: HostSubnets,
openshiftVersion?: string,
) =>
Yup.lazy((values: NetworkConfigurationValues) => {
const apiVipSchema =
values.stackType === DUAL_STACK
? vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips).min(
2,
'Provide both Primary and Secondary API IPs.',
)
: vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips);

return Yup.object<NetworkConfigurationValues>().shape({
apiVips: apiVipSchema,
Yup.lazy((values: NetworkConfigurationValues) =>
Yup.object<NetworkConfigurationValues>().shape({
apiVips: vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips),
ingressVips: vipArrayValidationSchema<IngressVip>(
hostSubnets,
values,
Expand Down Expand Up @@ -124,5 +116,5 @@ export const getNetworkConfigurationValidationSchema = (
)
: Yup.array(),
}),
});
});
}),
);
Loading