@openshift-assisted/ui-lib 2.47.1 → 2.47.2

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js

@@ -7,7 +7,7 @@ const common_1 = require("../../../../common");
 const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported) => {
     var _a, _b, _c;
     const isSNOCluster = (0, common_1.isSNO)(cluster);
-    const isDualStackType = (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion }));
+    const isDualStackType = (0, common_1.isDualStack)(cluster);
     return {
         apiVips: cluster.apiVips,
         ingressVips: cluster.ingressVips,
@@ -32,47 +32,42 @@ const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManaged
     };
 };
 exports.getNetworkInitialValues = getNetworkInitialValues;
-const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => {
-    const apiVipSchema = values.stackType === common_1.DUAL_STACK
-        ? (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips).min(2, 'Provide both Primary and Secondary API IPs.')
-        : (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips);
-    return Yup.object().shape({
-        apiVips: apiVipSchema,
-        ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
-        sshPublicKey: common_1.sshPublicKeyListValidationSchema,
-        machineNetworks: values.managedNetworkingType === 'userManaged'
-            ? Yup.array()
-            : common_1.machineNetworksValidationSchema.when('stackType', {
-                is: (stackType) => stackType === common_1.IPV4_STACK,
-                then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
-                otherwise: () => {
-                    var _a;
-                    return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                        ? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
-                        : Yup.array();
-                },
-            }),
-        clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
+const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => Yup.object().shape({
+    apiVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips),
+    ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
+    sshPublicKey: common_1.sshPublicKeyListValidationSchema,
+    machineNetworks: values.managedNetworkingType === 'userManaged'
+        ? Yup.array()
+        : common_1.machineNetworksValidationSchema.when('stackType', {
             is: (stackType) => stackType === common_1.IPV4_STACK,
-            then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
+            then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
             otherwise: () => {
                 var _a;
-                return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                    ? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network', openshiftVersion))
+                return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                    ? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
                     : Yup.array();
             },
         }),
-        serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
-            is: (stackType) => stackType === common_1.IPV4_STACK,
-            then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
-            otherwise: () => {
-                var _a;
-                return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                    ? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network', openshiftVersion))
-                    : Yup.array();
-            },
-        }),
-    });
-});
+    clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
+        is: (stackType) => stackType === common_1.IPV4_STACK,
+        then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
+        otherwise: () => {
+            var _a;
+            return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                ? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network', openshiftVersion))
+                : Yup.array();
+        },
+    }),
+    serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
+        is: (stackType) => stackType === common_1.IPV4_STACK,
+        then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
+        otherwise: () => {
+            var _a;
+            return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                ? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network', openshiftVersion))
+                : Yup.array();
+        },
+    }),
+}));
 exports.getNetworkConfigurationValidationSchema = getNetworkConfigurationValidationSchema;
 //# sourceMappingURL=networkConfigurationValidation.js.map

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js

@@ -9,7 +9,7 @@ const common_1 = require("../../../../common");
 const ClusterProperties_1 = require("../../clusterDetail/ClusterProperties");
 const ReviewNetworkingTable = ({ cluster }) => {
     const rows = react_1.default.useMemo(() => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g;
         const networkRows = [
             {
                 rowId: 'network-management',
@@ -43,7 +43,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'machine-networks' },
                     },
-                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion }))
+                    (0, common_1.isDualStack)(cluster)
                         ? {
                             title: (_c = cluster.machineNetworks) === null || _c === void 0 ? void 0 : _c.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
                                 index === 0 ? 'Primary' : 'Secondary',
@@ -59,9 +59,18 @@ const ReviewNetworkingTable = ({ cluster }) => {
                 cells: [
                     { title: 'API IP' },
                     {
-                        title: (0, common_1.selectApiVip)(cluster),
-                        props: { 'data-testid': 'api-vip', colSpan: 2 },
+                        title: (_d = cluster.apiVips) === null || _d === void 0 ? void 0 : _d.map((apiVip) => (react_1.default.createElement("span", { key: apiVip.ip },
+                            apiVip.ip,
+                            react_1.default.createElement("br", null)))),
+                        props: { 'data-testid': 'api-vip' },
                     },
+                    (0, common_1.isDualStack)(cluster)
+                        ? {
+                            title: (_e = cluster.apiVips) === null || _e === void 0 ? void 0 : _e.map((apiVip, index) => (react_1.default.createElement("span", { key: apiVip.ip },
+                                index === 0 ? 'Primary' : 'Secondary',
+                                react_1.default.createElement("br", null)))),
+                        }
+                        : { title: '' },
                 ],
             });
         cluster.ingressVips &&
@@ -71,9 +80,18 @@ const ReviewNetworkingTable = ({ cluster }) => {
                 cells: [
                     { title: 'Ingress IP' },
                     {
-                        title: (0, common_1.selectIngressVip)(cluster),
-                        props: { 'data-testid': 'ingress-vip', colSpan: 2 },
+                        title: (_f = cluster.ingressVips) === null || _f === void 0 ? void 0 : _f.map((ingressVip) => (react_1.default.createElement("span", { key: ingressVip.ip },
+                            ingressVip.ip,
+                            react_1.default.createElement("br", null)))),
+                        props: { 'data-testid': 'ingress-vip' },
                     },
+                    (0, common_1.isDualStack)(cluster)
+                        ? {
+                            title: (_g = cluster.ingressVips) === null || _g === void 0 ? void 0 : _g.map((ingressVip, index) => (react_1.default.createElement("span", { key: ingressVip.ip },
+                                index === 0 ? 'Primary' : 'Secondary',
+                                react_1.default.createElement("br", null)))),
+                        }
+                        : { title: '' },
                 ],
             });
         return networkRows;
@@ -91,7 +109,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'cluster-network-cidr' },
                     },
-                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                    (0, common_1.isDualStack)(cluster) && {
                         title: (_b = cluster.clusterNetworks) === null || _b === void 0 ? void 0 : _b.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
                             index === 0 ? 'Primary' : 'Secondary',
                             react_1.default.createElement("br", null)))),
@@ -108,7 +126,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'cluster-network-prefix' },
                     },
-                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                    (0, common_1.isDualStack)(cluster) && {
                         title: (_d = cluster.clusterNetworks) === null || _d === void 0 ? void 0 : _d.map((network, index) => (react_1.default.createElement("span", { key: network.hostPrefix },
                             index === 0 ? 'Primary' : 'Secondary',
                             react_1.default.createElement("br", null)))),
@@ -125,7 +143,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'service-network-cidr' },
                     },
-                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                    (0, common_1.isDualStack)(cluster) && {
                         title: (_f = cluster.serviceNetworks) === null || _f === void 0 ? void 0 : _f.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
                             index === 0 ? 'Primary' : 'Secondary',
                             react_1.default.createElement("br", null)))),

package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js

@@ -25,7 +25,7 @@ const getManagementType = ({ userManagedNetworking }) => {
     return managementType;
 };
 exports.getManagementType = getManagementType;
-const getStackTypeLabel = (cluster) => (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) ? 'Dual-stack' : 'IPv4';
+const getStackTypeLabel = (cluster) => (0, common_1.isDualStack)(cluster) ? 'Dual-stack' : 'IPv4';
 exports.getStackTypeLabel = getStackTypeLabel;
 const getDiskEncryptionEnabledOnStatus = (diskEncryption) => {
     let diskEncryptionType = null;
@@ -49,7 +49,7 @@ exports.getDiskEncryptionEnabledOnStatus = getDiskEncryptionEnabledOnStatus;
 const ClusterProperties = ({ cluster, externalMode = false }) => {
     var _a, _b;
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
-    const isDualStackType = (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion }));
+    const isDualStackType = (0, common_1.isDualStack)(cluster);
     const featureSupportLevelContext = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
     const activeFeatureConfiguration = featureSupportLevelContext.activeFeatureConfiguration;
     const underlyingCpuArchitecture = (activeFeatureConfiguration === null || activeFeatureConfiguration === void 0 ? void 0 : activeFeatureConfiguration.underlyingCpuArchitecture) || (0, common_1.getDefaultCpuArchitecture)();

package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterProperties.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterDetail/ClusterProperties.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClusterProperties.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterDetail/ClusterProperties.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js

@@ -15,7 +15,7 @@ const AssistedInstallerHeader = () => {
             react_1.default.createElement(react_core_1.SplitItem, null,
                 react_1.default.createElement(common_1.ExternalLink, { href: common_1.ASSISTED_INSTALLER_DOCUMENTATION_LINK }, "Assisted Installer documentation")),
             common_1.isInOcm && (react_1.default.createElement(react_core_1.SplitItem, null,
-                react_1.default.createElement(react_core_1.Content, { component: "a", "data-testid": "whats-new-link" }, "What's new in Assisted Installer?"))))));
+                react_1.default.createElement(react_core_1.Content, { component: "a", "data-testid": "whats-new-link", hidden: true }, "What's new in Assisted Installer?"))))));
 };
 exports.AssistedInstallerHeader = AssistedInstallerHeader;
 //# sourceMappingURL=AssistedInstallerHeader.js.map

package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAKyB;AACzB,yDAAqD;AAE9C,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,oDAEhD;QACT,6BAA6B,IAAI,8BAAC,yBAAgB,OAAG;QACtD,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,wCAEzC,CACA,CACb,CACK,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
+{"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAKyB;AACzB,yDAAqD;AAE9C,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,oDAEhD;QACT,6BAA6B,IAAI,8BAAC,yBAAgB,OAAG;QACtD,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,EAAC,MAAM,EAAE,IAAI,wCAEtD,CACA,CACb,CACK,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}

package/lib/common/components/clusterConfiguration/utils.ts

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

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -173,6 +173,17 @@ export const ipValidationSchema = Yup.string().test(
   (value?: string) => Address4.isValid(value || '') || Address6.isValid(value || ''),
 );
 
+// Helpers to classify literal IPs more robustly
+const isIPv4Address = (ip?: string) => {
+  if (!ip) return false;
+  return ip.includes('.') && Address4.isValid(ip);
+};
+
+const isIPv6Address = (ip?: string) => {
+  if (!ip) return false;
+  return ip.includes(':') && Address6.isValid(ip);
+};
+
 export const ipNoSuffixValidationSchema = Yup.string().test(
   'ip-validation-no-suffix',
   'Not a valid IP address',
@@ -202,7 +213,6 @@ export const vipRangeValidationSchema = (
     } catch (err) {
       return true;
     }
-
     const foundHostSubnets = [];
     if (machineNetworks) {
       const cidrs = machineNetworks?.map((network) => network.cidr);
@@ -303,12 +313,51 @@ export const vipNoSuffixValidationSchema = (
       vipDhcpAllocation: NetworkConfigurationValues['vipDhcpAllocation'],
       managedNetworkingType: NetworkConfigurationValues['managedNetworkingType'],
     ) => !vipDhcpAllocation && managedNetworkingType !== 'userManaged',
-    then: () =>
-      requiredOnceSet(head(initialValues)?.ip, 'Required. Please provide an IP address')
+    then: () => {
+      // Per-item schema for VIPs (apiVips[*].ip / ingressVips[*].ip)
+      // 1) Require value once set
+      // 2) Validate IP without suffix
+      // 3) Ensure VIP family matches machineNetworks[idx] family
+      // 4) Validate range vs selected subnets
+      // 5) No broadcast/network address
+      // 6) Uniqueness across API/Ingress
+      const vipFamilyMatchSchema = Yup.string().test(
+        'vip-family-match-machine-network',
+        'IP family must match the corresponding machine network family.',
+        function (value?: string) {
+          if (!value) {
+            return true;
+          }
+          // this.path looks like: "apiVips[0].ip" or "ingressVips[1].ip"
+          const path = this.path || '';
+          const match = path.match(/\[(\d+)\]/);
+          const index = match ? parseInt(match[1], 10) : NaN;
+          if (Number.isNaN(index)) {
+            return true;
+          }
+          const cidr = values.machineNetworks?.[index]?.cidr || '';
+          const mnIsV4 = isCIDR.v4(cidr);
+          const mnIsV6 = isCIDR.v6(cidr);
+          // If machine network at index is not selected/valid, don't block validation here
+          if (!mnIsV4 && !mnIsV6) {
+            return true;
+          }
+          const ipIsV4 = isIPv4Address(value);
+          const ipIsV6 = isIPv6Address(value);
+          if (!ipIsV4 && !ipIsV6) {
+            return true;
+          }
+          return mnIsV4 ? ipIsV4 : ipIsV6;
+        },
+      );
+
+      return requiredOnceSet(head(initialValues)?.ip, 'Required. Please provide an IP address')
         .concat(ipNoSuffixValidationSchema)
+        .concat(vipFamilyMatchSchema)
         .concat(vipRangeValidationSchema(hostSubnets, values, false))
         .concat(vipBroadcastValidationSchema(values))
-        .concat(vipUniqueValidationSchema(values, true)),
+        .concat(vipUniqueValidationSchema(values, true));
+    },
   });
 
 export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
@@ -324,11 +373,39 @@ export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
         }),
       )
     : Yup.array<T>()
-  ).test(
-    'vips-length',
-    'Both API and ingress APIs must be provided.',
-    (_value) => values.apiVips?.length === values.ingressVips?.length,
-  );
+  )
+    .test(
+      'vips-length',
+      'Both API and ingress APIs must be provided.',
+      (_value) => values.apiVips?.length === values.ingressVips?.length,
+    )
+    .test(
+      'vips-match-machine-networks',
+      'Primary API and Ingress IPs must match the primary machine network family; secondary must match the secondary machine network family.',
+      (_vips?: { ip?: string }[]) => {
+        const machineNetworks = values.machineNetworks || [];
+        const validateIndex = (idx: number) => {
+          const cidr = machineNetworks[idx]?.cidr || '';
+          const mIsIpv4 = isCIDR.v4(cidr);
+          const mIsIpv6 = isCIDR.v6(cidr);
+          if (!mIsIpv4 && !mIsIpv6) {
+            return true;
+          }
+          const api = values.apiVips?.[idx]?.ip || '';
+          const ing = values.ingressVips?.[idx]?.ip || '';
+          if (!api || !ing) {
+            return true;
+          }
+          const apiOk = mIsIpv4 ? isIPv4Address(api) : isIPv6Address(api);
+          const ingOk = mIsIpv4 ? isIPv4Address(ing) : isIPv6Address(ing);
+          return apiOk && ingOk;
+        };
+
+        const primaryOk = validateIndex(0);
+        const secondaryOk = validateIndex(1);
+        return primaryOk && secondaryOk;
+      },
+    );
 
 export const ipBlockValidationSchema = (reservedCidrs: string | string[] | undefined) =>
   Yup.string()
@@ -440,11 +517,11 @@ export const hostPrefixValidationSchema = (
   const errorMsgIPv4 = `${errorMsgPrefix} (${netBlockNumber}) and 25.`;
   const errorMsgIPv6 = `${errorMsgPrefix} (8) and 128.`;
 
-  if (Address6.isValid(clusterNetworkCidr || '')) {
+  if (isCIDR.v6(clusterNetworkCidr || '')) {
     return Yup.number().required(requiredText).min(8, errorMsgIPv6).max(128, errorMsgIPv6);
   }
 
-  if (Address4.isValid(clusterNetworkCidr || '')) {
+  if (isCIDR.v4(clusterNetworkCidr || '')) {
     return Yup.number()
       .required(requiredText)
       .min(netBlockNumber, errorMsgIPv4)
@@ -715,13 +792,52 @@ export const dualStackValidationSchema = (field: string, openshiftVersion?: stri
       (values?: { cidr: MachineNetwork['cidr'] }[]): boolean => {
         // For OCP versions > 4.11, allow IPv6 as primary network
         if (openshiftVersion && isMajorMinorVersionEqualOrGreater(openshiftVersion, '4.12')) {
-          return (
-            !!values?.[0].cidr &&
-            (Address4.isValid(values[0].cidr) || Address6.isValid(values[0].cidr))
-          );
+          return !!values?.[0].cidr && (isCIDR.v4(values[0].cidr) || isCIDR.v6(values[0].cidr));
         }
         // For older versions, require IPv4 as primary network
-        return !!values?.[0].cidr && Address4.isValid(values[0].cidr);
+        return !!values?.[0].cidr && isCIDR.v4(values[0].cidr);
+      },
+    )
+    .test(
+      'dual-stack-unique-cidrs',
+      `Provided ${field} subnets must be unique.`,
+      (values?: { cidr?: MachineNetwork['cidr'] }[]) => {
+        if (!values || values.length < 2) {
+          return true;
+        }
+        const first = values[0]?.cidr || '';
+        const second = values[1]?.cidr || '';
+        if (!first || !second) {
+          return true;
+        }
+        const firstIsCidr = isCIDR.v4(first) || isCIDR.v6(first);
+        const secondIsCidr = isCIDR.v4(second) || isCIDR.v6(second);
+        if (!firstIsCidr || !secondIsCidr) {
+          return true;
+        }
+        return first !== second;
+      },
+    )
+    .test(
+      'dual-stack-opposite-families',
+      `When two ${field} are provided, one must be IPv4 and the other IPv6.`,
+      (values?: { cidr?: MachineNetwork['cidr'] }[]) => {
+        if (!values || values.length < 2) {
+          return true;
+        }
+        const a = values[0]?.cidr || '';
+        const b = values[1]?.cidr || '';
+        if (!a || !b) {
+          return true;
+        }
+        const a4 = isCIDR.v4(a);
+        const a6 = isCIDR.v6(a);
+        const b4 = isCIDR.v4(b);
+        const b6 = isCIDR.v6(b);
+        if (!((a4 || a6) && (b4 || b6))) {
+          return true;
+        }
+        return (a4 && b6) || (a6 && b4);
       },
     );
 

package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx

@@ -72,6 +72,35 @@ export const AvailableSubnetsControl = ({
   const autoSelectNetwork = !isViewerMode && hasEmptySelection;
   useAutoSelectSingleAvailableSubnet(autoSelectNetwork, setFieldValue, cidr, clusterId);
 
+  // Ensure primary and secondary machine networks are not duplicated.
+  // If the user switches primary to the same CIDR as secondary, adjust secondary to the opposite family or clear it.
+  React.useEffect(() => {
+    if (!isDualStack) {
+      return;
+    }
+    if (!values.machineNetworks || values.machineNetworks.length < 2) {
+      return;
+    }
+    const first = values.machineNetworks?.[0]?.cidr || '';
+    const second = values.machineNetworks?.[1]?.cidr || '';
+    if (!first || !second) {
+      return;
+    }
+    if (first === second) {
+      if (Address6.isValid(first)) {
+        const nextIPv4 = IPv4Subnets[0]?.subnet || NO_SUBNET_SET;
+        const replacement = nextIPv4 !== first ? nextIPv4 : NO_SUBNET_SET;
+        setFieldValue('machineNetworks.1.cidr', replacement, true);
+      } else if (Address4.isValid(first)) {
+        const nextIPv6 = IPv6Subnets[0]?.subnet || NO_SUBNET_SET;
+        const replacement = nextIPv6 !== first ? nextIPv6 : NO_SUBNET_SET;
+        setFieldValue('machineNetworks.1.cidr', replacement, true);
+      } else {
+        setFieldValue('machineNetworks.1.cidr', NO_SUBNET_SET, true);
+      }
+    }
+  }, [isDualStack, values.machineNetworks, IPv4Subnets, IPv6Subnets, setFieldValue]);
+
   return (
     <>
       <FormGroup

package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx

@@ -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]);
@@ -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,
@@ -133,6 +152,9 @@ export const StackTypeControlGroup = ({
     values.clusterNetworks,
     values.machineNetworks,
     values.serviceNetworks,
+    values.apiVips,
+    values.ingressVips,
+    values.vipDhcpAllocation,
   ]);
 
   const setDualStack = () => {

package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts

@@ -34,7 +34,7 @@ export const getNetworkInitialValues = (
   isClusterManagedNetworkingUnsupported: boolean,
 ): NetworkConfigurationValues => {
   const isSNOCluster = isSNO(cluster);
-  const isDualStackType = isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion });
+  const isDualStackType = isDualStack(cluster);
 
   return {
     apiVips: cluster.apiVips,
@@ -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,
@@ -124,5 +116,5 @@ export const getNetworkConfigurationValidationSchema = (
               )
             : Yup.array(),
       }),
-    });
-  });
+    }),
+  );