npm - @openshift-assisted/ui-lib - Versions diffs - 2.52.2 → 5.0.0-cim - Mend

@openshift-assisted/ui-lib 2.52.2 → 5.0.0-cim

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (200) hide show

package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js CHANGED Viewed

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const formik_1 = require("formik");
+const is_cidr_1 = tslib_1.__importDefault(require("is-cidr"));
 const react_core_1 = require("@patternfly/react-core");
 const networkingSteps_1 = require("../../../common/components/clusterWizard/networkingSteps");
 const common_1 = require("../../../common");
 const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
-const NetworkTypeControlGroup_1 = require("../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup");
+const NetworkTypeDropdown_1 = require("./networking/NetworkTypeDropdown");
 const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisabled, defaultNetworkSettings, hideManagedNetworking, }) => {
     var _a, _b, _c;
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
@@ -18,18 +19,56 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
     const isSDNSelectable = react_1.default.useMemo(() => (0, common_1.canSelectNetworkTypeSDN)(!isMultiNodeCluster, isDualStack), [isMultiNodeCluster, isDualStack]);
     const [isAdvanced, setAdvanced] = react_1.default.useState(isDualStack || (0, common_1.isAdvNetworkConf)(cluster, defaultNetworkSettings));
     const toggleAdvConfiguration = (0, react_1.useCallback)((checked) => {
+        var _a, _b;
         setAdvanced(checked);
         if (!checked) {
-            setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv4);
-            setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv4);
+            const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
+            const useIPv6Defaults = primaryCidr && is_cidr_1.default.v6(primaryCidr);
+            setFieldValue('clusterNetworks', useIPv6Defaults
+                ? defaultNetworkSettings.clusterNetworksIpv6
+                : defaultNetworkSettings.clusterNetworksIpv4);
+            setFieldValue('serviceNetworks', useIPv6Defaults
+                ? defaultNetworkSettings.serviceNetworksIpv6
+                : defaultNetworkSettings.serviceNetworksIpv4);
         }
-    }, [setFieldValue, defaultNetworkSettings]);
+    }, [setFieldValue, defaultNetworkSettings, values.machineNetworks]);
     // Auto-enable advanced networking when switching to dual-stack
     (0, react_1.useEffect)(() => {
         if (isDualStack) {
             toggleAdvConfiguration(true);
         }
     }, [isDualStack, toggleAdvConfiguration]);
+    // Sync cluster/service networks to match primary machine network family when single-stack (fix mismatch)
+    (0, react_1.useEffect)(() => {
+        var _a, _b, _c, _d;
+        if (isDualStack) {
+            return;
+        }
+        const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
+        const firstClusterCidr = (_d = (_c = values.clusterNetworks) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.cidr;
+        if (!primaryCidr || !firstClusterCidr) {
+            return;
+        }
+        const primaryIsIPv6 = is_cidr_1.default.v6(primaryCidr);
+        const primaryIsIPv4 = is_cidr_1.default.v4(primaryCidr);
+        const clusterIsIPv6 = is_cidr_1.default.v6(firstClusterCidr);
+        const clusterIsIPv4 = is_cidr_1.default.v4(firstClusterCidr);
+        if (primaryIsIPv4 && clusterIsIPv6) {
+            setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv4);
+            setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv4);
+        }
+        else if (primaryIsIPv6 && clusterIsIPv4) {
+            setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv6);
+            setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv6);
+        }
+    }, [
+        isDualStack,
+        values.machineNetworks,
+        values.clusterNetworks,
+        values.serviceNetworks,
+        setFieldValue,
+        defaultNetworkSettings,
+    ]);
     const isUserManagedNetworking = values.managedNetworkingType === 'userManaged';
     const primaryMachineNetwork = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
     // Clear machine networks when switching to user-managed networking for multi-node clusters
@@ -72,9 +111,9 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
     return (react_1.default.createElement(react_core_1.Grid, { hasGutter: true },
         !hideManagedNetworking && react_1.default.createElement(networkingSteps_1.ManagedNetworkingControlGroup, null),
         isUserManagedNetworking && (react_1.default.createElement(networkingSteps_1.UserManagedNetworkingTextContent, { shouldDisplayLoadBalancersBullet: isMultiNodeCluster, docVersion: cluster.openshiftVersion })),
-        (!isMultiNodeCluster || !isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.StackTypeControlGroup, { clusterId: cluster.id, isDualStackSelectable: isDualStackSelectable, hostSubnets: hostSubnets, defaultNetworkValues: defaultNetworkSettings })),
-        react_1.default.createElement(NetworkTypeControlGroup_1.NetworkTypeControlGroup, { isSDNSelectable: isSDNSelectable }),
-        !(isMultiNodeCluster && isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.AvailableSubnetsControl, { clusterId: cluster.id, hostSubnets: hostSubnets, isRequired: !isUserManagedNetworking, isDisabled: hostSubnets.length === 0, openshiftVersion: cluster.openshiftVersion, hosts: cluster.hosts || [], isMultiNodeCluster: isMultiNodeCluster })),
+        react_1.default.createElement(NetworkTypeDropdown_1.NetworkTypeDropDown, { isSDNSelectable: isSDNSelectable }),
+        (!isMultiNodeCluster || !isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.StackTypeControlGroup, { clusterId: cluster.id, isDualStackSelectable: isDualStackSelectable, hostSubnets: hostSubnets, defaultNetworkValues: defaultNetworkSettings, allowSingleStackIPv6: true })),
+        !(isMultiNodeCluster && isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.AvailableSubnetsControl, { clusterId: cluster.id, hostSubnets: hostSubnets, isRequired: !isUserManagedNetworking, isDisabled: hostSubnets.length === 0, openshiftVersion: cluster.openshiftVersion, hosts: cluster.hosts || [], isMultiNodeCluster: isMultiNodeCluster, allowSingleStackIPv6: true })),
         !isUserManagedNetworking && (react_1.default.createElement(networkingSteps_1.VirtualIPControlGroup, { cluster: cluster, hostSubnets: hostSubnets, isVipDhcpAllocationDisabled: isVipDhcpAllocationDisabled })),
         react_1.default.createElement(react_core_1.Checkbox, { id: "useAdvancedNetworking", label: t('ai:Use advanced networking'), description: t('ai:Configure advanced networking properties (e.g. CIDR ranges).'), isChecked: isAdvanced, onChange: (_event, checked) => toggleAdvConfiguration(checked), isDisabled: isDualStack, body: isAdvanced && react_1.default.createElement(networkingSteps_1.AdvancedNetworkFields, null) })));
 };

package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,mCAA0C;AAC1C,uDAAwD;AAExD,8FAQkE;AAClE,4CAOyB;AACzB,2FAA+E;AAC/E,~~8HAA2H~~;~~AAc3H~~,MAAM,oBAAoB,GAAG,CAAC,EAC5B,OAAO,EACP,WAAW,EACX,2BAA2B,EAC3B,sBAAsB,EACtB,qBAAqB,GACK,EAAE,EAAE;;IAC9B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GACrD,IAAA,yBAAgB,GAA8B,CAAC;IAEjD,MAAM,kBAAkB,GAAG,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,qBAAqB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAA,uBAAc,EAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAE9F,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,KAAK,mBAAU,CAAC;IACpD,MAAM,eAAe,GAAG,eAAK,CAAC,OAAO,CACnC,GAAG,EAAE,CAAC,IAAA,gCAAuB,EAAC,CAAC,kBAAkB,EAAE,WAAW,CAAC,EAC/D,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAClC,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAC9C,WAAW,IAAI,IAAA,yBAAgB,EAAC,OAAO,EAAE,sBAAsB,CAAC,CACjE,CAAC;IAEF,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EACxC,CAAC,OAAgB,EAAE,EAAE;QACnB,WAAW,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,~~aAAa~~,CAAC,~~iBAAiB~~,EAAE,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;~~YAC7E~~,aAAa,~~CAAC~~,iBAAiB,~~EAAE~~,sBAAsB,CAAC,mBAAmB,CAAC,CAAC~~;QAC~~/E,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,sBAAsB,CAAC,~~CACxC~~,CAAC;IAEF,+DAA+D;IAC/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE,CAAC;YAChB,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAE1C,MAAM,uBAAuB,GAAG,MAAM,CAAC,qBAAqB,KAAK,aAAa,CAAC;IAC/E,MAAM,qBAAqB,GAAG,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;IAEhE,2FAA2F;IAC3F,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACb,IAAI,uBAAuB,IAAI,kBAAkB,KAAI,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,CAAA,EAAE,CAAC;YACpF,aAAa,CAAC,iBAAiB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACjG,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACzB,aAAa,CAAC,aAAa,EAAE,yBAAgB,CAAC,CAAC;QACjD,CAAC;QACD,yFAAyF;QACzF,uDAAuD;IACzD,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;IAErD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,uBAAuB,EAAE,CAAC;YAC5B,MAAM,cAAc,GAAG,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;YAEjD,2FAA2F;YAC3F,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC1C,aAAa,CAAC,aAAa,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;YACjD,aAAa,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC9B,aAAa,CAAC,aAAa,CAAC,CAAC;gBAC7B,aAAa,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,EAAE;QACD,OAAO,CAAC,eAAe;QACvB,kBAAkB;QAClB,uBAAuB;QACvB,aAAa;QACb,MAAM,CAAC,iBAAiB;QACxB,aAAa;QACb,qBAAqB;KACtB,CAAC,CAAC;~~IACH~~,OAAO,CACL,8BAAC,iBAAI,IAAC,SAAS;QACZ,CAAC,qBAAqB,IAAI,8BAAC,+CAA6B,OAAG;QAE3D,uBAAuB,IAAI,CAC1B,8BAAC,kDAAgC,IAC/B,gCAAgC,EAAE,kBAAkB,EACpD,UAAU,EAAE,OAAO,CAAC,gBAAgB,GACpC,CACH;~~QAEA~~,CAAC,CAAC,kBAAkB,IAAI,CAAC,uBAAuB,CAAC,IAAI,CACpD,8BAAC,uCAAqB,IACpB,SAAS,EAAE,OAAO,CAAC,EAAE,EACrB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,sBAAsB,~~GAC5C~~,~~CACH;QAED~~,~~8BAAC~~,~~iDAAuB,IAAC,eAAe,EAAE,eAAe,GAAI~~;~~QAE5D~~,CAAC,CAAC,kBAAkB,IAAI,uBAAuB,CAAC,IAAI,CACnD,8BAAC,yCAAuB,IACtB,SAAS,EAAE,OAAO,CAAC,EAAE,EACrB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,CAAC,uBAAuB,EACpC,UAAU,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC,EACpC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,EAC1B,kBAAkB,EAAE,kBAAkB,~~GACtC~~,CACH;QAEA,CAAC,uBAAuB,IAAI,CAC3B,8BAAC,uCAAqB,IACpB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,2BAA2B,EAAE,2BAA2B,GACxD,CACH;QAED,8BAAC,qBAAQ,IACP,EAAE,EAAC,uBAAuB,EAC1B,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC,EACtC,WAAW,EAAE,CAAC,CAAC,iEAAiE,CAAC,EACjF,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAgB,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,EACvE,UAAU,EAAE,WAAW,EACvB,IAAI,EAAE,UAAU,IAAI,8BAAC,uCAAqB,OAAG,GAC7C,CACG,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
1	+ {"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js CHANGED Viewed

@@ -13,7 +13,7 @@ const types_1 = require("../../../types");
 const ConfigMapForm_1 = require("./ConfigMapForm");
 const utils_1 = require("../../../utils");
 const ClusterDeploymentCustomManifestsStep = ({ agentClusterInstall, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const { t } = (0, common_1.useTranslation)();
     const initialValues = {
         configMaps: ((_b = (_a = agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.manifestsConfigMapRefs) === null || _b === void 0 ? void 0 : _b.map(({ name }) => ({
@@ -21,24 +21,23 @@ const ClusterDeploymentCustomManifestsStep = ({ agentClusterInstall, }) => {
             valid: false,
         }))) || [],
     };
-    const validationSchema = Yup.lazy((values) => {
-        var _a;
-        return Yup.object({
-            configMaps: Yup.array()
-                .of(Yup.object().shape({
-                name: Yup.string().required(t('ai:Config map name is required')),
-                valid: Yup.boolean().isTrue(t('ai:Config map not found')),
-                manifestNames: Yup.array()
-                    .of(Yup.string())
-                    .test('unique-manifests', t('ai:Manifest names in each config map should be unique across all referenced config maps.'), (value) =>
-                // check if another config map has any manifests with the same names as this one
-                values.configMaps
-                    .flatMap(({ manifestNames }) => manifestNames)
-                    .filter((v) => value === null || value === void 0 ? void 0 : value.includes(v)).length === (value === null || value === void 0 ? void 0 : value.length)),
-            }))
-                .min(((_a = agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.platformType) === 'External' ? 1 : 0, t('ai:At least one config map is required')),
-        });
-    });
+    const usesExternalPlatform = ((_c = agentClusterInstall.spec) === null || _c === void 0 ? void 0 : _c.platformType) === 'External';
+    const usesThirdPartyCNI = (0, common_1.isThirdPartyCNI)((_d = agentClusterInstall.spec) === null || _d === void 0 ? void 0 : _d.networking.networkType);
+    const validationSchema = Yup.lazy((values) => Yup.object({
+        configMaps: Yup.array()
+            .of(Yup.object().shape({
+            name: Yup.string().required(t('ai:Config map name is required')),
+            valid: Yup.boolean().isTrue(t('ai:Config map not found')),
+            manifestNames: Yup.array()
+                .of(Yup.string())
+                .test('unique-manifests', t('ai:Manifest names in each config map should be unique across all referenced config maps.'), (value) =>
+            // check if another config map has any manifests with the same names as this one
+            values.configMaps
+                .flatMap(({ manifestNames }) => manifestNames)
+                .filter((v) => value === null || value === void 0 ? void 0 : value.includes(v)).length === (value === null || value === void 0 ? void 0 : value.length)),
+        }))
+            .min(usesExternalPlatform || usesThirdPartyCNI ? 1 : 0, t('ai:At least one config map is required')),
+    }));
     const onSubmit = (values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const patches = [];
@@ -56,16 +55,18 @@ const ClusterDeploymentCustomManifestsStep = ({ agentClusterInstall, }) => {
             react_1.default.createElement(common_1.ClusterWizardStepHeader, null, t('ai:Custom manifests'))),
         react_1.default.createElement(react_core_1.GridItem, null,
             react_1.default.createElement(react_core_1.Alert, { variant: "info", isInline: true, title: t('ai:Add custom manifests'), actionLinks: [
-                    react_1.default.createElement(react_core_1.AlertActionLink, { key: "define-config-map", component: 'a', href: `/k8s/ns/${(_c = agentClusterInstall.metadata) === null || _c === void 0 ? void 0 : _c.namespace}/core~v1~ConfigMap`, target: "_blank", rel: "noopener noreferrer" },
+                    react_1.default.createElement(react_core_1.AlertActionLink, { key: "define-config-map", component: 'a', href: `/k8s/ns/${(_e = agentClusterInstall.metadata) === null || _e === void 0 ? void 0 : _e.namespace}/core~v1~ConfigMap`, target: "_blank", rel: "noopener noreferrer" },
                         t('ai:Define a config map'),
                         " ",
                         react_1.default.createElement(external_link_alt_icon_1.default, null)),
                 ] },
                 react_1.default.createElement(react_core_1.Content, { component: react_core_1.ContentVariants.p }, t('ai:Define a config map with your custom manifests and select it in the form below.')),
                 react_1.default.createElement(react_core_1.Content, { component: react_core_1.ContentVariants.p }, t('ai:Manifest names in each config map should be unique across all referenced config maps.')))),
+        (usesExternalPlatform || usesThirdPartyCNI) && (react_1.default.createElement(react_core_1.GridItem, null,
+            react_1.default.createElement(common_1.CustomManifestsAlert, { usesExternalPlatform: usesExternalPlatform, usesThirdPartyCNI: usesThirdPartyCNI }))),
         react_1.default.createElement(react_core_1.GridItem, null,
             react_1.default.createElement(formik_1.Formik, { initialValues: initialValues, onSubmit: onSubmit, validationSchema: validationSchema },
-                react_1.default.createElement(ConfigMapForm_1.ConfigMapForm, { namespace: (_d = agentClusterInstall.metadata) === null || _d === void 0 ? void 0 : _d.namespace })))));
+                react_1.default.createElement(ConfigMapForm_1.ConfigMapForm, { namespace: (_f = agentClusterInstall.metadata) === null || _f === void 0 ? void 0 : _f.namespace })))));
 };
 exports.ClusterDeploymentCustomManifestsStep = ClusterDeploymentCustomManifestsStep;
 //# sourceMappingURL=ClusterDeploymentCustomManifestsStep.js.map

package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ClusterDeploymentCustomManifestsStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,mCAAgC;AAChC,8EAAwE;AACxE,uDAOgC;AAChC,kIAA+F;AAC/F,+~~CAA6E~~;~~AAC7E~~,0CAA0F;AAC1F,mDAAwE;AACxE,0CAA6C;AAEtC,MAAM,oCAAoC,GAAG,CAAC,EACnD,mBAAmB,GAGpB,EAAE,EAAE;;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,uBAAc,GAAE,CAAC;IAE/B,MAAM,aAAa,GAA2B;QAC5C,UAAU,EACR,CAAA,MAAA,MAAA,mBAAmB,CAAC,IAAI,0CAAE,sBAAsB,0CAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACnE,IAAI;YACJ,KAAK,EAAE,KAAK;SACb,CAAC,CAAC,KAAI,EAAE;KACZ,CAAC;IAEF,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,MAA8B,EAAE,EAAE~~;;QACnE~~,~~OAAA~~,GAAG,CAAC,MAAM,CAAyB;~~YACjC~~,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE;~~iBACpB~~,EAAE,CACD,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;~~gBACjB~~,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC;~~gBAChE~~,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;~~gBACzD~~,aAAa,EAAE,GAAG,CAAC,KAAK,EAAE;~~qBACvB~~,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;~~qBAChB~~,IAAI,CACH,kBAAkB,EAClB,CAAC,CACC,0FAA0F,CAC3F,EACD,CAAC,KAAK,EAAE,EAAE;~~gBACR~~,gFAAgF;~~gBAChF~~,MAAM,CAAC,UAAU;~~qBACd~~,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC;~~qBAC7C~~,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,MAAK,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,CAChE;~~aACJ~~,CAAC,CACH;~~iBACA~~,GAAG,CACF,~~CAAA~~,~~MAAA,mBAAmB,CAAC,~~IAAI,~~0CAAE~~,~~YAAY,MAAK,UAAU,~~CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,~~EAC7D~~,CAAC,CAAC,wCAAwC,CAAC,CAC5C;~~SACJ~~,CAAC,~~CAAA;KAAA,~~CACH,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAO,MAA8B,EAAE,EAAE;;QACxD,MAAM,OAAO,GAAY,EAAE,CAAC;QAC5B,IAAA,mBAAW,EACT,OAAO,EACP,8BAA8B,EAC9B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAC/C,MAAA,mBAAmB,CAAC,IAAI,0CAAE,sBAAsB,CACjD,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAA,6BAAQ,EAAC;gBACb,KAAK,EAAE,gCAAwB;gBAC/B,QAAQ,EAAE,mBAAmB;gBAC7B,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,CACL,8BAAC,iBAAI,IAAC,SAAS;QACb,8BAAC,qBAAQ;YACP,8BAAC,gCAAuB,QAAE,CAAC,CAAC,qBAAqB,CAAC,CAA2B,CACpE;QACX,8BAAC,qBAAQ;YACP,8BAAC,kBAAK,IACJ,OAAO,EAAC,MAAM,EACd,QAAQ,QACR,KAAK,EAAE,CAAC,CAAC,yBAAyB,CAAC,EACnC,WAAW,EAAE;oBACX,8BAAC,4BAAe,IACd,GAAG,EAAC,mBAAmB,EACvB,SAAS,EAAE,GAAG,EACd,IAAI,EAAE,WACJ,MAAA,mBAAmB,CAAC,QAAQ,0CAAE,SAChC,oBAAoB,EACpB,MAAM,EAAC,QAAQ,EACf,GAAG,EAAC,qBAAqB;wBAExB,CAAC,CAAC,wBAAwB,CAAC;;wBAAE,8BAAC,gCAAmB,OAAG,CACrC;iBACnB;gBAED,8BAAC,oBAAO,IAAC,SAAS,EAAE,4BAAe,CAAC,CAAC,IAClC,CAAC,CACA,oFAAoF,CACrF,CACO;gBACV,8BAAC,oBAAO,IAAC,SAAS,EAAE,4BAAe,CAAC,CAAC,IAClC,CAAC,CACA,0FAA0F,CAC3F,CACO,CACJ,CACC;~~QACX~~,8BAAC,qBAAQ;YACP,8BAAC,eAAM,IACL,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,gBAAgB;gBAElC,8BAAC,6BAAa,IAAC,SAAS,EAAE,MAAA,mBAAmB,CAAC,QAAQ,0CAAE,SAAmB,GAAI,CACxE,CACA,CACN,CACR,CAAC;AACJ,CAAC,CAAC;~~AA7GW~~,QAAA,oCAAoC,~~wCA6G~~/C"}
1	+ {"version":3,"file":"ClusterDeploymentCustomManifestsStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js CHANGED Viewed

@@ -1,23 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNetworkInitialValues = void 0;
+const tslib_1 = require("tslib");
+const is_cidr_1 = tslib_1.__importDefault(require("is-cidr"));
 const utils_1 = require("../../../common/components/clusterConfiguration/utils");
 const common_1 = require("../../../common");
 const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
-    var _a;
+    var _a, _b, _c;
     const managedNetworkingType = cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged';
     const isDualStackCluster = (0, utils_1.isDualStack)(cluster);
+    const primaryMachineCidr = (_b = (_a = cluster.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
+    const isSingleStackIPv6 = !isDualStackCluster && primaryMachineCidr && is_cidr_1.default.v6(primaryMachineCidr);
     let clusterNetworks = cluster.clusterNetworks;
-    if (!((_a = cluster.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length)) {
-        clusterNetworks = isDualStackCluster
-            ? defaultNetworkSettings.clusterNetworksDualstack
-            : defaultNetworkSettings.clusterNetworksIpv4;
+    if (!((_c = cluster.clusterNetworks) === null || _c === void 0 ? void 0 : _c.length)) {
+        if (isDualStackCluster) {
+            clusterNetworks = defaultNetworkSettings.clusterNetworksDualstack;
+        }
+        else if (isSingleStackIPv6) {
+            clusterNetworks = defaultNetworkSettings.clusterNetworksIpv6;
+        }
+        else {
+            clusterNetworks = defaultNetworkSettings.clusterNetworksIpv4;
+        }
     }
     let serviceNetworks = cluster.serviceNetworks;
     if (!(serviceNetworks === null || serviceNetworks === void 0 ? void 0 : serviceNetworks.length)) {
-        serviceNetworks = isDualStackCluster
-            ? defaultNetworkSettings.serviceNetworksDualstack
-            : defaultNetworkSettings.serviceNetworksIpv4;
+        if (isDualStackCluster) {
+            serviceNetworks = defaultNetworkSettings.serviceNetworksDualstack;
+        }
+        else if (isSingleStackIPv6) {
+            serviceNetworks = defaultNetworkSettings.serviceNetworksIpv6;
+        }
+        else {
+            serviceNetworks = defaultNetworkSettings.serviceNetworksIpv4;
+        }
     }
     const machineNetworks = cluster.machineNetworks || [];
     return {
@@ -30,7 +46,7 @@ const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
         vipDhcpAllocation: cluster.vipDhcpAllocation,
         managedNetworkingType,
         networkType: cluster.networkType || common_1.NETWORK_TYPE_OVN,
-        stackType: isDualStackCluster ? common_1.DUAL_STACK : common_1.IPV4_STACK,
+        stackType: isDualStackCluster ? common_1.DUAL_STACK : common_1.SINGLE_STACK,
     };
 };
 exports.getNetworkInitialValues = getNetworkInitialValues;

package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"~~;;;AAKA~~,iFAAoF;AACpF,~~4CAA2E~~;~~AAEpE~~,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,~~sBAMC~~,EAC2B,EAAE;;IAC9B,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC/F,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;~~IAEhD~~,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM,CAAA,EAAE,CAAC;QACrC,eAAe,GAAG,~~kBAAkB~~;~~YAClC~~,CAAC,CAAC,sBAAsB,CAAC,~~wBAAwB~~;~~YACjD~~,CAAC,CAAC,sBAAsB,CAAC,mBAAmB,CAAC;~~IACjD~~,CAAC;IAED,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA,EAAE,CAAC;QAC7B,eAAe,GAAG,~~kBAAkB~~;~~YAClC~~,CAAC,CAAC,sBAAsB,CAAC,~~wBAAwB~~;~~YACjD~~,CAAC,CAAC,sBAAsB,CAAC,mBAAmB,CAAC;~~IACjD~~,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;IAEtD,OAAO;QACL,eAAe;QACf,eAAe;QACf,eAAe;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,qBAAqB;QACrB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAgB;QACpD,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC,~~mBAAU~~;~~KACxD~~,CAAC;AACJ,CAAC,CAAC;~~AAzCW~~,QAAA,uBAAuB,~~2BAyClC~~"}
1	+ {"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":";;;;AAAA,8DAA6B;AAM7B,iFAAoF;AACpF,4CAA6E;AAEtE,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,sBAQC,EAC2B,EAAE;;IAC9B,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC/F,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,MAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;IAC9D,MAAM,iBAAiB,GACrB,CAAC,kBAAkB,IAAI,kBAAkB,IAAI,iBAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;IAE7E,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM,CAAA,EAAE,CAAC;QACrC,IAAI,kBAAkB,EAAE,CAAC;YACvB,eAAe,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;QACpE,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC7B,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA,EAAE,CAAC;QAC7B,IAAI,kBAAkB,EAAE,CAAC;YACvB,eAAe,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;QACpE,CAAC;aAAM,IAAI,iBAAiB,EAAE,CAAC;YAC7B,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;IAEtD,OAAO;QACL,eAAe;QACf,eAAe;QACf,eAAe;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,qBAAqB;QACrB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAgB;QACpD,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC,qBAAY;KAC1D,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,uBAAuB,2BAsDlC"}

package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js ADDED Viewed

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetworkTypeDropDown = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importDefault(require("react"));
+const formik_1 = require("formik");
+const react_core_1 = require("@patternfly/react-core");
+const ui_1 = require("../../../../common/components/ui");
+const networkType_1 = require("../../../../common/types/networkType");
+const hooks_1 = require("../../../../common/hooks");
+const common_1 = require("../../../../common");
+const NetworkTypeDropDown = ({ isSDNSelectable }) => {
+    const { t } = (0, hooks_1.useTranslation)();
+    const [field, , { setValue }] = (0, formik_1.useField)('networkType');
+    const [isOpen, setOpen] = react_1.default.useState(false);
+    const { values } = (0, formik_1.useFormikContext)();
+    const fieldId = (0, ui_1.getFieldId)('networkType', 'input');
+    const showThirdPartyBanner = (0, networkType_1.isThirdPartyCNI)(values.networkType);
+    const currentDisplayValue = (0, networkType_1.NETWORK_TYPE_LABELS)(t)[field.value];
+    const dropdownItems = Object.entries((0, networkType_1.NETWORK_TYPE_LABELS)(t)).map(([value, label]) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, value: value, isAriaDisabled: value === networkType_1.NETWORK_TYPE_SDN && !isSDNSelectable }, label)));
+    const onSelect = (_event, nextValue) => {
+        if (nextValue) {
+            setValue(nextValue);
+        }
+        setOpen(false);
+    };
+    const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, currentDisplayValue || t('ai:Network type')));
+    return (react_1.default.createElement(react_core_1.Stack, { hasGutter: true },
+        react_1.default.createElement(react_core_1.StackItem, null,
+            react_1.default.createElement(react_core_1.FormGroup, { fieldId: fieldId, label: t('ai:Network type'), id: `form-control__${fieldId}` },
+                react_1.default.createElement(react_core_1.Dropdown, { id: `${fieldId}-dropdown`, onOpenChange: (open) => setOpen(open), onSelect: onSelect, toggle: toggle, isOpen: isOpen }, dropdownItems))),
+        showThirdPartyBanner && react_1.default.createElement(common_1.ThirdPartyCNIBanner, null)));
+};
+exports.NetworkTypeDropDown = NetworkTypeDropDown;
+//# sourceMappingURL=NetworkTypeDropdown.js.map

package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"NetworkTypeDropdown.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,mCAAoD;AACpD,uDAQgC;AAChC,yDAA8D;AAE9D,sEAI8C;AAC9C,oDAA0D;AAC1D,+CAAyD;AAElD,MAAM,mBAAmB,GAAG,CAAC,EAAE,eAAe,EAAgC,EAAE,EAAE;IACvF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,sBAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,aAAa,CAAC,CAAC;IAChE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAClE,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAEnD,MAAM,oBAAoB,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,iCAAmB,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,iCAAmB,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CACnF,8BAAC,yBAAY,IACX,GAAG,EAAE,KAAK,EACV,EAAE,EAAE,KAAK,EACT,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,KAAK,KAAK,8BAAgB,IAAI,CAAC,eAAe,IAE7D,KAAK,CACO,CAChB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,CAAC,MAA8C,EAAE,SAAkB,EAAQ,EAAE;QAC5F,IAAI,SAAS,EAAE,CAAC;YACd,QAAQ,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAC1D,8BAAC,uBAAU,IACT,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,OAAO,EACX,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAE1B,mBAAmB,IAAI,CAAC,CAAC,iBAAiB,CAAC,CACjC,CACd,CAAC;IAEF,OAAO,CACL,8BAAC,kBAAK,IAAC,SAAS;QACd,8BAAC,sBAAS;YACR,8BAAC,sBAAS,IAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,iBAAiB,OAAO,EAAE;gBACtF,8BAAC,qBAAQ,IACP,EAAE,EAAE,GAAG,OAAO,WAAW,EACzB,YAAY,EAAE,CAAC,IAAa,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC9C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,IAEb,aAAa,CACL,CACD,CACF;QACX,oBAAoB,IAAI,8BAAC,4BAAmB,OAAG,CAC1C,CACT,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,mBAAmB,uBA2D9B"}

package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js CHANGED Viewed

@@ -23,24 +23,19 @@ const getInfraEnvProxy = (infraEnvs) => {
         }),
     };
 };
-const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) => Yup.object().shape({
-    clusterNetworks: (0, common_2.clusterNetworksValidationSchema)(t).when('stackType', {
-        is: (stackType) => stackType === common_2.IPV4_STACK,
-        then: () => (0, common_2.clusterNetworksValidationSchema)(t).concat(common_2.IPv4ValidationSchema),
-        otherwise: () => (0, common_2.clusterNetworksValidationSchema)(t).concat((0, common_2.dualStackValidationSchema)(t('ai:cluster network'), t, openshiftVersion)),
-    }),
-    serviceNetworks: (0, common_2.serviceNetworkValidationSchema)(t).when('stackType', {
-        is: (stackType) => stackType === common_2.IPV4_STACK,
-        then: () => (0, common_2.serviceNetworkValidationSchema)(t).concat(common_2.IPv4ValidationSchema),
-        otherwise: () => (0, common_2.serviceNetworkValidationSchema)(t).concat((0, common_2.dualStackValidationSchema)(t('ai:service network'), t, openshiftVersion)),
-    }),
-    apiVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
-    ingressVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
-    sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
-    httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
-    httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }), // share the schema, httpS is currently not supported
-    noProxy: (0, common_2.noProxyValidationSchema)(t),
-}));
+const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) => {
+    var _a, _b, _c, _d, _e, _f;
+    return Yup.object().shape({
+        clusterNetworks: (0, common_2.clusterNetworksSchema)(t, (_a = values.stackType) !== null && _a !== void 0 ? _a : '', (_c = (_b = values.machineNetworks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.cidr, openshiftVersion),
+        serviceNetworks: (0, common_2.serviceNetworksSchema)(t, (_d = values.stackType) !== null && _d !== void 0 ? _d : '', (_f = (_e = values.machineNetworks) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.cidr, openshiftVersion),
+        apiVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
+        ingressVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
+        sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
+        httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
+        httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }), // share the schema, httpS is currently not supported
+        noProxy: (0, common_2.noProxyValidationSchema)(t),
+    });
+});
 const useNetworkingFormik = ({ clusterDeployment, agentClusterInstall, agents, }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     const initialValues = react_1.default.useMemo(() => {

package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAG3B,sCAA4D;AAC5D,iFAAuF;AACvF,qFAA2E;AAO3E,wCAA0C;AAC1C,iDAA8D;AAC9D,~~4CAayB~~;AAEzB,2FAA+E;AAE/E,MAAM,gBAAgB,GAAG,CAAC,SAAgC,EAAE,EAAE;IAC5D,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CACtC,CAAC,EAAE,EAAE,EAAE,+BAAC,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,MAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA,KAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA,EAAA,CAC3F,CAAC;IACF,OAAO;QACL,iBAAiB;QACjB,WAAW,EAAE,SAAS,CAAC,KAAK,CAC1B,CAAC,EAAE,EAAE,EAAE;;YACL,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,SAAS,CAAA;gBACvE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA;gBACzE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA;SAAA,CACtE;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uCAAuC,GAAG,CAC9C,aAAgD,EAChD,WAAwB,EACxB,CAAY,EACZ,gBAAyB,EACzB,EAAE,CACF,GAAG,CAAC,IAAI,CAAC,CAAC,MAAyC,EAAE,EAAE,~~CACrD~~,GAAG,CAAC,MAAM,EAAqC,CAAC,KAAK,CAAC;~~IACpD~~,eAAe,EAAE,IAAA,~~wCAA+B~~,~~EAAC~~,CAAC,~~CAAC~~,~~CAAC~~,~~IAAI,CAAC,WAAW,EAAE;QACpE,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;QACpF,IAAI,EAAE,GAAG,EAAE,CAAC,IAAA,wCAA+B,EAAC,CAAC,CAAC,CAAC,~~MAAM,CAAC,~~6BAAoB,CAAC;QAC3E,~~SAAS,~~EAAE~~,~~GAAG,~~EAAE,~~CACd~~,~~IAAA~~,~~wCAA+B~~,~~EAAC,CAAC,CAAC,CAAC,~~MAAM,~~CACvC,IAAA,kCAAyB,EAAC,~~CAAC,~~CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,CACxE;KACJ,CAAC;IACF,~~eAAe,~~EAAE~~,~~IAAA,uCAA8B,EAAC,~~CAAC,CAAC,~~CAAC~~,IAAI,~~CAAC~~,~~WAAW~~,~~EAAE~~;~~QACnE~~,~~EAAE~~,EAAE,~~CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;QACpF,IAAI,EAAE,GAAG,EAAE,CAAC,~~IAAA,~~uCAA8B~~,~~EAAC~~,CAAC,~~CAAC~~,~~CAAC~~,MAAM,CAAC,~~6BAAoB,CAAC;QAC1E,~~SAAS,~~EAAE~~,~~GAAG,~~EAAE,~~CACd~~,~~IAAA~~,~~uCAA8B~~,~~EAAC~~,CAAC,~~CAAC~~,~~CAAC~~,~~MAAM,CACtC,IAAA,kCAAyB,EAAC,~~CAAC,CAAC,~~oBAAoB~~,~~CAAC~~,~~EAAE~~,~~CAAC,EAAE,~~gBAAgB,~~CAAC,CACxE~~;~~KACJ~~,~~CAAC;IACF,~~OAAO,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;~~IACzD~~,WAAW,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;~~IAC7D~~,YAAY,EAAE,IAAA,yCAAgC,EAAC,CAAC,CAAC;~~IACjD~~,SAAS,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;~~IAChF~~,UAAU,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,qDAAqD;~~IACvI~~,OAAO,EAAE,IAAA,gCAAuB,EAAC,CAAC,CAAC;~~CACpC~~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"}
1	+ {"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js CHANGED Viewed

@@ -17,7 +17,7 @@ const NodePoolForm = ({ agents, nodePool, hostedCluster, agentMachines }) => {
     let maxAgents = 0;
     const availableAgents = (0, helpers_1.getAgentsForSelection)(agents).filter((agent) => values.agentLabels.every(({ key, value }) => { var _a, _b; return ((_b = (_a = agent.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b[key]) === value; }) &&
         !agent.spec.clusterDeploymentName);
-    const ocpVersion = (0, helpers_1.getVersionFromReleaseImage)(hostedCluster.spec.release.image);
+    const ocpVersion = (0, helpers_1.getVersionFromReleaseString)(hostedCluster.spec.release.image);
     if (isEdit) {
         const nodePoolAgents = (0, utils_1.getNodepoolAgents)(nodePool, agents, agentMachines, hostedCluster);
         maxAgents =

package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/NodePoolForm.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAQgC;AAChC,mCAA0C;AAE1C,+CAAgD;AAChD,8FAAkF;AAElF,~~2CAAkF~~;~~AAClF~~,6FAA6D;AAO7D,oCAA6C;AAS7C,MAAM,YAAY,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAqB,EAAE,EAAE;;IAC7F,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAAsB,CAAC;IAE1D,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,aAAa,CAAC;IAE7C,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,eAAe,GAAG,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC,MAAM,CAC1D,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,0CAAG,GAAG,CAAC,MAAK,KAAK,CAAA,EAAA,CAAC;QACrF,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CACpC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,~~oCAA0B~~,EAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;~~IAEhF~~,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QACzF,SAAS;YACP,cAAc,CAAC,MAAM;gBACrB,eAAe,CAAC,MAAM,CACpB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,GAAG,OAAK,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAG,CAAA,CAAA,EAAA,CAAC,CAChF,CAAC,MAAM,CAAC;IACb,CAAC;SAAM,CAAC;QACN,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC;IACtC,CAAC;IAED,OAAO,CACL,oBAAC,iBAAI;QACH,oBAAC,iBAAI,IAAC,SAAS;YACb,oBAAC,qBAAQ;gBACP,oBAAC,4BAAe,IAAC,YAAY;oBAC3B,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,QAAE,CAAC,CAAC,mBAAmB,CAAC,CAAuB;wBACnE,oBAAC,uCAA0B,QACxB,MAAA,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,0CAAE,cAAc,CACvB,CACR,CACP,CACT;YACX,oBAAC,qBAAQ,QACN,QAAQ,CAAC,CAAC,CAAC,CACV,oBAAC,4BAAe,IAAC,YAAY;gBAC3B,oBAAC,iCAAoB;oBACnB,oBAAC,gCAAmB,QAAE,CAAC,CAAC,aAAa,CAAC,CAAuB;oBAC7D,oBAAC,uCAA0B,QAAE,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,CAA8B,CAC7D,CACP,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,mBAAU,IAAC,IAAI,EAAC,cAAc,EAAC,UAAU,QAAC,KAAK,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAI,CAC5E,CACQ;YACX,oBAAC,qBAAQ;gBACP,oBAAC,4BAAkB,IACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAC,OAAO,EACjB,SAAS,EAAC,aAAa,EACvB,eAAe,EAAE,aAAa,EAC9B,kBAAkB,EAAE,gBAAgB,EACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACd,CACO;YACX,oBAAC,qBAAQ;gBACP,oBAAC,4BAAe,IAAC,YAAY,QAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;oBAC5E,oBAAC,iCAAoB;wBACnB,oBAAC,gCAAmB,QAAE,CAAC,CAAC,sBAAsB,CAAC,CAAuB;wBACtE,oBAAC,uCAA0B,QACxB,UAAU,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CACpB,CACR,CACP,CACT,CACN,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
1	+ {"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/NodePoolForm.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js CHANGED Viewed

@@ -34,11 +34,8 @@ const ACMFeatureSupportLevelProvider = ({ children, clusterImages, isEditCluster
     }, []);
     const ocpVersions = (0, helpers_1.getOCPVersions)(clusterImages);
     const getNormalizedVersion = react_1.default.useCallback((versionName) => {
-        var _a, _b;
         const clusterImage = clusterImages.find((clusterImageSet) => { var _a; return ((_a = clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.name) === versionName; });
-        const version = (0, helpers_1.getVersionFromReleaseImage)((_a = clusterImage === null || clusterImage === void 0 ? void 0 : clusterImage.spec) === null || _a === void 0 ? void 0 : _a.releaseImage) ||
-            ((_b = clusterImage === null || clusterImage === void 0 ? void 0 : clusterImage.metadata) === null || _b === void 0 ? void 0 : _b.name) ||
-            '';
+        const version = (0, helpers_1.getVersionFromClusterImageSet)(clusterImage);
         return (0, utils_1.getMajorMinorVersion)(version);
     }, [clusterImages]);
     const getVersionSupportLevelsMap = react_1.default.useCallback((versionName) => {

package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ACMFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../../lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx"],"names":[],"mappings":";;;;AAAA,0DAAiD;AACjD,4CAMyB;AAEzB,sDAAiE;AACjE,2DAAmF;AACnF,~~wCAAwE~~;~~AACxE~~,2FAA+E;AAE/E,iDAA6D;AAM7D,MAAM,0BAA0B,GAAG,GAA4B,EAAE;IAC/D,IAAI,CAAC;QACH,MAAM,uBAAuB,GAA4B,EAAE,CAAC;QAC5D,mCAAuB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxD,MAAM,eAAe,GAA4B,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC;YACpD,CAAC,CAAC,CAAC;YACH,uBAAuB,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,sBAAsB;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,8BAA8B,GAA6C,CAAC,EACvF,QAAQ,EACR,aAAa,EACb,iBAAiB,GAAG,KAAK,GAC1B,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,gBAAgB,GAA4B,eAAK,CAAC,OAAO,CAA0B,GAAG,EAAE;QAC5F,OAAO,0BAA0B,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,oBAAoB,GAAG,eAAK,CAAC,WAAW,CAC5C,CAAC,WAAmB,EAAE,EAAE;;QACtB,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CACrC,CAAC,eAAe,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAI,MAAK,WAAW,CAAA,EAAA,CACpE,CAAC;QACF,MAAM,OAAO,~~GACX~~,IAAA,~~oCAA0B~~,EAAC,~~MAAA,~~YAAY,~~aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,0CAAE,YAAY,~~CAAC~~;aAC5D~~,~~MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,0CAAE,IAAI,CAAA;YAC5B,EAAE,~~CAAC;~~QACL~~,OAAO,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IACvC,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,0BAA0B,GAC9B,eAAK,CAAC,WAAW,CACf,CAAC,WAAmB,EAAuC,EAAE;QAC3D,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,UAAU;YACf,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC;YAC9B,CAAC,CAAC;YACE,mCAAmC;aACpC,CAAC;IACR,CAAC,EACD,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CACzC,CAAC;IAEJ,yHAAyH;IACzH,MAAM,sBAAsB,GAC1B,eAAK,CAAC,WAAW,CACf,CAAC,WAAmB,EAAE,SAAoB,EAA4B,EAAE;QACtE,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;QACxE,OAAO,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,CAAC,EACD,CAAC,0BAA0B,CAAC,CAC7B,CAAC;IAEJ,MAAM,0BAA0B,GAAG,eAAK,CAAC,WAAW,CAClD,CAAC,WAAmB,EAAE,SAAoB,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpE,OAAO,IAAA,sCAAkB,EAAC,YAAY,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,sBAAsB,CAAC,CACzB,CAAC;IAEF,MAAM,yBAAyB,GAAG,eAAK,CAAC,WAAW,CACjD,CAAC,WAAmB,EAAE,SAAoB,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,0BAA0B,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACvE,OAAO,IAAA,4CAAwB,EAC7B,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,CAAC,CACF,CAAC;IACJ,CAAC,EACD,CAAC,0BAA0B,EAAE,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAChE,CAAC;IAEF,MAAM,iBAAiB,GAAG,eAAK,CAAC,WAAW,CACzC,CAAC,OAAe,EAAE,SAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,EAC1F,CAAC,yBAAyB,CAAC,CAC5B,CAAC;IAEF,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CAA0B,GAAG,EAAE;QAChE,OAAO;YACL,0BAA0B;YAC1B,sBAAsB;YACtB,iBAAiB;YACjB,wBAAwB,EAAE,yBAAyB;YACnD,kBAAkB,EAAE,0BAA0B;SAC/C,CAAC;IACJ,CAAC,EAAE;QACD,0BAA0B;QAC1B,sBAAsB;QACtB,iBAAiB;QACjB,yBAAyB;QACzB,0BAA0B;KAC3B,CAAC,CAAC;IAEH,OAAO,CACL,8BAAC,2CAAkC,IAAC,KAAK,EAAE,aAAa,IACrD,QAAQ,CAC0B,CACtC,CAAC;AACJ,CAAC,CAAC;~~AAlGW~~,QAAA,8BAA8B,~~kCAkGzC~~;AAEF,kBAAe,sCAA8B,CAAC"}
1	+ {"version":3,"file":"ACMFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../../lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/helpers/versions.js CHANGED Viewed

@@ -1,36 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNetworkType = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.supportedNutanixPlatforms = exports.getVersionFromReleaseImage = void 0;
+exports.getNetworkType = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.getVersionFromClusterImageSet = exports.getVersionFromReleaseString = void 0;
 const tslib_1 = require("tslib");
 const uniqBy_js_1 = tslib_1.__importDefault(require("lodash-es/uniqBy.js"));
+const common_1 = require("../../../common");
 const utils_1 = require("../../../common/utils");
-const getVersionFromReleaseImage = (releaseImage = '') => {
-    const match = /.+:(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(releaseImage);
+const getVersionFromReleaseString = (value = '') => {
+    const match = /(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(value);
     if (match && match.length > 1 && match[1]) {
         return match[1];
     }
 };
-exports.getVersionFromReleaseImage = getVersionFromReleaseImage;
-const getCPUArchFromReleaseImage = (releaseImage = '') => {
-    const match = /.+:.*-(.*)/gm.exec(releaseImage);
+exports.getVersionFromReleaseString = getVersionFromReleaseString;
+const getVersionFromClusterImageSet = (clusterImageSet) => {
+    var _a, _b, _c, _d;
+    return ((0, exports.getVersionFromReleaseString)((_b = (_a = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b['releaseTag']) ||
+        (0, exports.getVersionFromReleaseString)((_c = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.spec) === null || _c === void 0 ? void 0 : _c.releaseImage) ||
+        ((_d = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _d === void 0 ? void 0 : _d.name) ||
+        '');
+};
+exports.getVersionFromClusterImageSet = getVersionFromClusterImageSet;
+const getCPUArchFromReleaseString = (value = '') => {
+    const match = /(?:\d+\.)+\d+-(x86-64|[\w_]+)/gm.exec(value);
     if (match && match.length > 1 && match[1]) {
         return match[1];
     }
 };
-// eslint-disable-next-line
-const getSupportLevelFromChannel = (channel) => {
-    if (!channel) {
-        return 'maintenance';
-    }
-    if (channel.startsWith('fast')) {
-        return 'beta'; // TODO(mlibra): Is this correct?
-    }
-    if (channel.startsWith('stable')) {
-        return 'production';
+const getCPUArchFromClusterImageSet = (clusterImageSet) => {
+    var _a, _b, _c, _d, _e, _f;
+    const cpuArch = ((_b = (_a = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.architecture) ||
+        getCPUArchFromReleaseString((_d = (_c = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _c === void 0 ? void 0 : _c.labels) === null || _d === void 0 ? void 0 : _d['releaseTag']) ||
+        getCPUArchFromReleaseString((_e = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.spec) === null || _e === void 0 ? void 0 : _e.releaseImage) ||
+        getCPUArchFromReleaseString((_f = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _f === void 0 ? void 0 : _f.name) ||
+        '';
+    switch (cpuArch) {
+        case common_1.CpuArchitecture.x86:
+        case common_1.CpuArchitecture.ARM:
+        case common_1.CpuArchitecture.s390x:
+        case common_1.CpuArchitecture.MULTI:
+            return cpuArch;
+        case 'x86-64':
+            return common_1.CpuArchitecture.x86;
+        default:
+            return undefined;
     }
-    return 'beta';
 };
-exports.supportedNutanixPlatforms = ['x86_64', 'x86-64'];
 const isValidImageSet = (cis, architectures, extended) => {
     var _a, _b;
     if (!extended && ((_b = (_a = cis.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.visible) !== 'true') {
@@ -49,19 +63,15 @@ const extractMajorMinor = (version) => {
 };
 // Converts a ClusterImageSet to an OpenshiftVersionOptionType
 const toVersionOption = (clusterImageSet) => {
-    var _a, _b, _c, _d;
-    const version = (0, exports.getVersionFromReleaseImage)((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage) ||
-        ((_b = clusterImageSet.metadata) === null || _b === void 0 ? void 0 : _b.name) ||
-        '';
-    const cpuArch = getCPUArchFromReleaseImage((_c = clusterImageSet.spec) === null || _c === void 0 ? void 0 : _c.releaseImage);
+    var _a;
+    const version = (0, exports.getVersionFromClusterImageSet)(clusterImageSet);
+    const cpuArch = getCPUArchFromClusterImageSet(clusterImageSet);
     return {
         label: `OpenShift ${version}`,
         version,
-        value: (_d = clusterImageSet.metadata) === null || _d === void 0 ? void 0 : _d.name,
+        value: (_a = clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.name,
         default: false,
-        // (rawagner) ACM does not have the warning so changing to 'production'
-        // supportLevel : getSupportLevelFromChannel(clusterImageSet.metadata?.labels?.channel)
-        supportLevel: 'production',
+        supportLevel: 'production', // ACM doesn't have feature support levels
         cpuArchitectures: cpuArch ? [cpuArch] : undefined,
     };
 };
@@ -75,8 +85,9 @@ const hasMatchingOsImage = (version, osImageVersions) => {
         return true;
     return osImageVersions.includes(extractMajorMinor(version.version));
 };
+const supportedNutanixPlatforms = ['x86_64', 'x86-64'];
 const getOCPVersions = (clusterImageSets, isNutanix, osImages, extended) => {
-    const architectures = isNutanix ? exports.supportedNutanixPlatforms : undefined;
+    const architectures = isNutanix ? supportedNutanixPlatforms : undefined;
     const osImageVersions = [...new Set(osImages === null || osImages === void 0 ? void 0 : osImages.map((img) => img.openshiftVersion))];
     const versions = clusterImageSets
         .filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, architectures, extended))

package/build/cjs/cim/components/helpers/versions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":";;;;AAAA,4EAAyC;~~AAUzC~~,iDAAgE;AAEzD,MAAM,~~0BAA0B~~,GAAG,CAAC,~~YAAY~~,GAAG,EAAE,EAAE,EAAE;~~IAC9D~~,MAAM,KAAK,GAAG,~~oCAAoC~~,CAAC,IAAI,CAAC,~~YAAY~~,CAAC,CAAC;~~IACtE~~,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC;AALW,QAAA,~~0BAA0B~~,~~8BAKrC~~;AAEF,MAAM,~~0BAA0B~~,GAAG,CAAC,~~YAAY~~,GAAG,EAAE,EAAE,EAAE;~~IACvD~~,MAAM,KAAK,GAAG,~~cAAc~~,CAAC,IAAI,CAAC,~~YAAY~~,CAAC,CAAC;~~IAChD~~,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC;AAEF,~~2BAA2B;AAC3B,~~MAAM,~~0BAA0B~~,GAAG,~~CACjC~~,~~OAAgB~~,~~EAC6B~~,EAAE;~~IAC~~/C,~~IAAI~~,CAAC,~~OAAO~~,~~EAAE~~,~~CAAC;QACb~~,~~OAAO~~,~~aAAa~~,CAAC~~;IACvB~~,CAAC;~~IAED~~,IAAI,~~OAAO~~,CAAC,~~UAAU~~,CAAC,~~MAAM~~,CAAC,EAAE,CAAC;~~QAC/B~~,OAAO,~~MAAM~~,CAAC,CAAC,~~iCAAiC;IAClD~~,CAAC;~~IAED~~,~~IAAI~~,~~OAAO~~,CAAC,~~UAAU~~,CAAC,~~QAAQ~~,CAAC,~~EAAE~~,CAAC;~~QACjC~~,~~OAAO~~,~~YAAY~~,CAAC~~;IACtB~~,~~CAAC~~;~~IAED~~,OAAO,~~MAAM~~,CAAC;~~AAChB~~,~~CAAC~~,~~CAAC~~;~~AAEW~~,~~QAAA~~,~~yBAAyB~~,GAAG,CAAC,~~QAAQ~~,~~EAAE~~,~~QAAQ~~,CAAC,CAAC;~~AAEvD~~,MAAM,eAAe,GAAG,CAC7B,GAA+B,EAC/B,aAAwB,EACxB,QAAkB,EAClB,EAAE;;IACF,IAAI,CAAC,QAAQ,IAAI,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,0CAAE,OAAO,MAAK,MAAM,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CACvB,CAAC,IAAI,EAAE,EAAE,mBAAC,OAAA,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAI,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,0CAAE,YAAY,MAAK,IAAI,CAAA,EAAA,CAC/F,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B;AAEF,4FAA4F;AAC5F,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAU,EAAE;IACpD,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC5D,OAAO,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/D,CAAC,CAAC;AAEF,8DAA8D;AAC9D,MAAM,eAAe,GAAG,CACtB,eAA2C,EACf,EAAE;;IAC9B,MAAM,OAAO,~~GACX~~,IAAA,~~kCAA0B~~,EAAC,~~MAAA,~~eAAe,CAAC,~~IAAI,0CAAE,YAAY,~~CAAC;~~SAC9D~~,~~MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAI,CAAA;QAC9B,EAAE,CAAC;IACL,~~MAAM,OAAO,GAAG,~~0BAA0B~~,CAAC,~~MAAA,~~eAAe,CAAC,~~IAAI,0CAAE,YAAY,~~CAAC~~,CAAC~~;~~IAC~~/E,OAAO;QACL,KAAK,EAAE,aAAa,OAAO,EAAE;QAC7B,OAAO;QACP,KAAK,EAAE,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAc;QAC/C,OAAO,EAAE,KAAK;QACd,~~uEAAuE;QACvE~~,~~uFAAuF;QACvF~~,YAAY,EAAE,~~YAAY~~;~~QAC1B~~,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,~~OAA0B~~,CAAC,CAAC,CAAC,CAAC,SAAS;~~KACrE~~,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,CACzB,OAAmC,EACnC,eAAuC,EAC9B,EAAE;IACX,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzC,OAAO,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;~~AAEK~~,MAAM,cAAc,GAAG,CAC5B,gBAA8C,EAC9C,SAAmB,EACnB,QAAoB,EACpB,QAAkB,EACY,EAAE;IAChC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,~~iCAAyB~~,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAEnF,MAAM,QAAQ,GAAG,gBAAgB;SAC9B,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;SACtF,GAAG,CAAC,eAAe,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;SACrD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAElD,8CAA8C;IAC9C,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAE5C,OAAO,IAAA,mBAAM,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAC;AAnBW,QAAA,cAAc,kBAmBzB;AAEK,MAAM,kBAAkB,GAAG,CAChC,aAA2C,EAC3C,mBAAmD,EACnD,EAAE;;IACF,MAAM,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAC7C,CAAC,EAAE,EAAE,EAAE,mBAAC,OAAA,CAAA,MAAA,EAAE,CAAC,QAAQ,0CAAE,IAAI,OAAK,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,WAAW,0CAAE,IAAI,CAAA,CAAA,EAAA,CAC3E,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC,MAAA,MAAA,IAAA,sBAAc,EAAC,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,0CAAG,CAAC,CAAC,0CAAE,OAAO;QAClF,CAAC,CAAC,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,WAAW,0CAAE,IAAI,CAAC;AACnD,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B;AAEK,MAAM,wBAAwB,GAAG,CAAC,EAA8B,EAAsB,EAAE,2BAC7F,OAAA,CAAA,MAAA,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,MAAM,0CAAE,OAAO,0CAAG,CAAC,CAAC,0CAAE,OAAO,MAAI,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,aAAa,0CAAE,OAAO,CAAA,CAAA,EAAA,CAAC;AAD3D,QAAA,wBAAwB,4BACmC;AAEjE,MAAM,cAAc,GAAG,CAC5B,UAAkD,EAChB,EAAE;IACpC,MAAM,eAAe,GAAG,IAAA,+BAAuB,EAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,MAAM,CAAC,CAAC;IAErD,OAAO,CAAC,eAAe,IAAI,eAAe,IAAI,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;AAChG,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB"}
1	+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"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"}