@openshift-assisted/ui-lib 2.54.1 → 5.0.1-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.
- package/build/@types/cim/components/modals/CimConfiguration/CimStorageMissingAlert.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/constants.d.ts +1 -1
- package/build/@types/common/components/clusterConfiguration/utils.d.ts +9 -1
- package/build/@types/common/components/clusterConfiguration/utils.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts.map +1 -1
- package/build/@types/ocm/components/Routes.d.ts +1 -1
- package/build/@types/ocm/components/Routes.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/utils.d.ts +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/utils.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerDetailCard.d.ts +1 -1
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerDetailCard.d.ts.map +1 -1
- package/build/@types/ocm/components/ui/Buttons/BackButton.d.ts +1 -1
- package/build/@types/ocm/components/ui/Buttons/BackButton.d.ts.map +1 -1
- package/build/@types/ocm/store/hooks.d.ts +1 -1
- package/build/@types/ocm/store/slices/clusters/selectors.d.ts +5 -61
- package/build/@types/ocm/store/slices/clusters/selectors.d.ts.map +1 -1
- package/build/@types/ocm/store/slices/feature-flags/selectors.d.ts +2 -20
- package/build/@types/ocm/store/slices/feature-flags/selectors.d.ts.map +1 -1
- package/build/@types/ocm/store/slices/infra-envs/selectors.d.ts +4 -21
- package/build/@types/ocm/store/slices/infra-envs/selectors.d.ts.map +1 -1
- package/build/cjs/cim/components/Agent/NoAgentsAlert.js +2 -2
- package/build/cjs/cim/components/Agent/NoAgentsAlert.js.map +1 -1
- package/build/cjs/cim/components/Agent/tableColumns.js +3 -3
- package/build/cjs/cim/components/Agent/tableColumns.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/NodePoolsTable.js +2 -2
- package/build/cjs/cim/components/Hypershift/DetailsPage/NodePoolsTable.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/AddHostDropdown.js +2 -2
- package/build/cjs/cim/components/InfraEnv/AddHostDropdown.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigProgressAlert.js +3 -3
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigProgressAlert.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationFormFields.js +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationFormFields.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js +2 -2
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/CimStorageMissingAlert.js +3 -3
- package/build/cjs/cim/components/modals/CimConfiguration/CimStorageMissingAlert.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/constants.js +1 -1
- package/build/cjs/cim/components/modals/MassDeleteAgentModal.js +2 -2
- package/build/cjs/cim/components/modals/MassDeleteAgentModal.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/utils.js +13 -1
- package/build/cjs/common/components/clusterConfiguration/utils.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/utils.test.js +36 -0
- package/build/cjs/common/components/clusterConfiguration/utils.test.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js +29 -31
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js +19 -30
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js.map +1 -1
- package/build/cjs/common/validationSchemas/addressValidation.js +1 -1
- package/build/cjs/common/validationSchemas/addressValidation.js.map +1 -1
- package/build/cjs/ocm/components/Routes.js +8 -8
- package/build/cjs/ocm/components/Routes.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterProgressItems.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterProgressItems.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.js +68 -17
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +50 -13
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js +4 -2
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js +7 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.test.js +35 -0
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.test.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerDetailCard.js +4 -4
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerDetailCard.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterDetail.js +4 -4
- package/build/cjs/ocm/components/clusterDetail/ClusterDetail.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js +4 -4
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js +2 -2
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js +2 -2
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js +2 -2
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/Operators.js +4 -4
- package/build/cjs/ocm/components/clusterWizard/Operators.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js +3 -3
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterBreadcrumbs.js +2 -2
- package/build/cjs/ocm/components/clusters/ClusterBreadcrumbs.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js +4 -4
- package/build/cjs/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/cjs/ocm/components/clusters/Clusters.js +3 -3
- package/build/cjs/ocm/components/clusters/Clusters.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClustersListToolbar.js +3 -3
- package/build/cjs/ocm/components/clusters/ClustersListToolbar.js.map +1 -1
- package/build/cjs/ocm/components/ui/Buttons/BackButton.js +2 -2
- package/build/cjs/ocm/components/ui/Buttons/BackButton.js.map +1 -1
- package/build/cjs/ocm/store/slices/clusters/selectors.js +2 -2
- package/build/cjs/ocm/store/slices/clusters/selectors.js.map +1 -1
- package/build/cjs/ocm/store/slices/feature-flags/selectors.js.map +1 -1
- package/build/cjs/ocm/store/slices/infra-envs/selectors.js.map +1 -1
- package/lib/cim/components/Agent/NoAgentsAlert.tsx +1 -1
- package/lib/cim/components/Agent/tableColumns.tsx +1 -1
- package/lib/cim/components/Hypershift/DetailsPage/NodePoolsTable.tsx +1 -1
- package/lib/cim/components/InfraEnv/AddHostDropdown.tsx +1 -1
- package/lib/cim/components/modals/CimConfiguration/CimConfigProgressAlert.tsx +2 -2
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationFormFields.tsx +1 -1
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx +2 -2
- package/lib/cim/components/modals/CimConfiguration/CimStorageMissingAlert.tsx +5 -2
- package/lib/cim/components/modals/CimConfiguration/constants.ts +1 -1
- package/lib/cim/components/modals/MassDeleteAgentModal.tsx +1 -1
- package/lib/common/components/clusterConfiguration/utils.test.ts +43 -1
- package/lib/common/components/clusterConfiguration/utils.ts +13 -0
- package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx +31 -57
- package/lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx +33 -38
- package/lib/common/validationSchemas/addressValidation.tsx +2 -2
- package/lib/ocm/components/Routes.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/OcmClusterProgressItems.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx +86 -22
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +57 -20
- package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx +4 -2
- package/lib/ocm/components/clusterConfiguration/review/utils.test.ts +41 -0
- package/lib/ocm/components/clusterConfiguration/review/utils.tsx +5 -2
- package/lib/ocm/components/clusterDetail/AssistedInstallerDetailCard.tsx +1 -1
- package/lib/ocm/components/clusterDetail/ClusterDetail.tsx +3 -3
- package/lib/ocm/components/clusterWizard/ClusterDetails.tsx +2 -2
- package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx +1 -1
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +1 -1
- package/lib/ocm/components/clusterWizard/ClusterWizardFooter.tsx +1 -1
- package/lib/ocm/components/clusterWizard/Operators.tsx +2 -2
- package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx +2 -2
- package/lib/ocm/components/clusters/ClusterBreadcrumbs.tsx +1 -1
- package/lib/ocm/components/clusters/ClusterPage.tsx +1 -1
- package/lib/ocm/components/clusters/Clusters.tsx +2 -2
- package/lib/ocm/components/clusters/ClustersListToolbar.tsx +2 -2
- package/lib/ocm/components/ui/Buttons/BackButton.tsx +1 -1
- package/lib/ocm/store/slices/clusters/selectors.tsx +7 -5
- package/lib/ocm/store/slices/feature-flags/selectors.ts +5 -2
- package/lib/ocm/store/slices/infra-envs/selectors.ts +4 -2
- package/package.json +8 -8
|
@@ -74,7 +74,7 @@ const CimConfigurationModal = ({ isOpen, onClose, agentServiceConfig, platform,
|
|
|
74
74
|
const initialValues = {
|
|
75
75
|
dbVolSize: (0, helpers_1.getStorageSizeGiB)(10, (_d = (_c = (_b = (_a = agentServiceConfig === null || agentServiceConfig === void 0 ? void 0 : agentServiceConfig.spec) === null || _a === void 0 ? void 0 : _a.databaseStorage) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.requests) === null || _d === void 0 ? void 0 : _d.storage),
|
|
76
76
|
fsVolSize: (0, helpers_1.getStorageSizeGiB)(100, (_h = (_g = (_f = (_e = agentServiceConfig === null || agentServiceConfig === void 0 ? void 0 : agentServiceConfig.spec) === null || _e === void 0 ? void 0 : _e.filesystemStorage) === null || _f === void 0 ? void 0 : _f.resources) === null || _g === void 0 ? void 0 : _g.requests) === null || _h === void 0 ? void 0 : _h.storage),
|
|
77
|
-
imgVolSize: (0, helpers_1.getStorageSizeGiB)(
|
|
77
|
+
imgVolSize: (0, helpers_1.getStorageSizeGiB)(100, (_m = (_l = (_k = (_j = agentServiceConfig === null || agentServiceConfig === void 0 ? void 0 : agentServiceConfig.spec) === null || _j === void 0 ? void 0 : _j.imageStorage) === null || _k === void 0 ? void 0 : _k.resources) === null || _l === void 0 ? void 0 : _l.requests) === null || _m === void 0 ? void 0 : _m.storage),
|
|
78
78
|
configureLoadBalancer: platform === 'AWS',
|
|
79
79
|
addCiscoIntersightURL: !!((_p = (_o = agentServiceConfig === null || agentServiceConfig === void 0 ? void 0 : agentServiceConfig.metadata) === null || _o === void 0 ? void 0 : _o.annotations) === null || _p === void 0 ? void 0 : _p['ciscoIntersightURL']),
|
|
80
80
|
ciscoIntersightURL: ((_r = (_q = agentServiceConfig === null || agentServiceConfig === void 0 ? void 0 : agentServiceConfig.metadata) === null || _q === void 0 ? void 0 : _q.annotations) === null || _r === void 0 ? void 0 : _r['ciscoIntersightURL']) || '',
|
|
@@ -87,7 +87,7 @@ const CimConfigurationModal = ({ isOpen, onClose, agentServiceConfig, platform,
|
|
|
87
87
|
.min(constants_1.MIN_FS_VOL_SIZE, t('ai:Minimal value is 1Gi'))
|
|
88
88
|
.required(t('ai:Required field')),
|
|
89
89
|
imgVolSize: Yup.number()
|
|
90
|
-
.min(constants_1.MIN_IMG_VOL_SIZE, t('ai:Minimal value is
|
|
90
|
+
.min(constants_1.MIN_IMG_VOL_SIZE, t('ai:Minimal value is 50Gi'))
|
|
91
91
|
.required(t('ai:Required field')),
|
|
92
92
|
configureLoadBalancer: Yup.boolean(),
|
|
93
93
|
addCiscoIntersightURL: Yup.boolean(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CimConfigurationModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CimConfigurationModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CimStorageMissingAlert = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const React = tslib_1.__importStar(require("react"));
|
|
6
|
-
const
|
|
6
|
+
const react_router_1 = require("react-router");
|
|
7
7
|
const react_core_1 = require("@patternfly/react-core");
|
|
8
8
|
const external_link_alt_icon_1 = require("@patternfly/react-icons/dist/js/icons/external-link-alt-icon");
|
|
9
9
|
const use_translation_wrapper_1 = require("../../../../common/hooks/use-translation-wrapper");
|
|
10
10
|
const CimStorageMissingAlert = ({ docStorageUrl, storageOperatorUrl }) => {
|
|
11
11
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
12
|
-
const navigate = (0,
|
|
12
|
+
const navigate = (0, react_router_1.useNavigate)();
|
|
13
13
|
const contentWorkaround = (React.createElement(React.Fragment, null,
|
|
14
14
|
t('ai:Learn more about storage class'),
|
|
15
15
|
"\u00A0\u00A0",
|
|
16
16
|
React.createElement(external_link_alt_icon_1.ExternalLinkAltIcon, null)));
|
|
17
17
|
const actionLinks = [
|
|
18
|
-
React.createElement(react_core_1.AlertActionLink, { key: "install-storage-operator", onClick: () => navigate(storageOperatorUrl) }, t('ai:Install storage operator')),
|
|
18
|
+
React.createElement(react_core_1.AlertActionLink, { key: "install-storage-operator", onClick: () => void navigate(storageOperatorUrl) }, t('ai:Install storage operator')),
|
|
19
19
|
React.createElement(react_core_1.AlertActionLink, { key: "storage-class", onClick: () => window.open(docStorageUrl, '_blank') }, contentWorkaround),
|
|
20
20
|
];
|
|
21
21
|
return (React.createElement(react_core_1.Alert, { title: t('ai:Must have a storage class'), variant: react_core_1.AlertVariant.warning, isInline: true, actionLinks: actionLinks }, t("ai:You'll first need to have a storage operator in order to create the storage class. If you don't have one installed, we recommend OpenShift Data Foundation operator, but you may use any.")));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CimStorageMissingAlert.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/CimStorageMissingAlert.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B
|
|
1
|
+
{"version":3,"file":"CimStorageMissingAlert.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/CimStorageMissingAlert.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,+CAA2C;AAC3C,uDAA8E;AAC9E,yGAAmG;AAEnG,8FAAkF;AAE3E,MAAM,sBAAsB,GAG9B,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,EAAE;IAC7C,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,MAAM,iBAAiB,GAAG,CACxB;QACG,CAAC,CAAC,mCAAmC,CAAC;;QACvC,oBAAC,4CAAmB,OAAG,CACtB,CACJ,CAAC;IAEF,MAAM,WAAW,GAAsB;QACrC,oBAAC,4BAAe,IACd,GAAG,EAAC,0BAA0B,EAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,QAAQ,CAAC,kBAAkB,CAAC,IAE/C,CAAC,CAAC,6BAA6B,CAAC,CACjB;QAClB,oBAAC,4BAAe,IAAC,GAAG,EAAC,eAAe,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,IACrF,iBAAsC,CACvB;KACnB,CAAC;IAEF,OAAO,CACL,oBAAC,kBAAK,IACJ,KAAK,EAAE,CAAC,CAAC,8BAA8B,CAAC,EACxC,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,QAAQ,QACR,WAAW,EAAE,WAAW,IAEvB,CAAC,CACA,8LAA8L,CAC/L,CACK,CACT,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CIM_CONFIG_TIMEOUT = exports.MIN_IMG_VOL_SIZE = exports.MIN_FS_VOL_SIZE = exports.MIN_DB_VOL_SIZE = void 0;
|
|
4
4
|
exports.MIN_DB_VOL_SIZE = 1; // In Gi
|
|
5
5
|
exports.MIN_FS_VOL_SIZE = 1;
|
|
6
|
-
exports.MIN_IMG_VOL_SIZE =
|
|
6
|
+
exports.MIN_IMG_VOL_SIZE = 50;
|
|
7
7
|
exports.CIM_CONFIG_TIMEOUT = 5 * 60 * 1000; // in ms
|
|
8
8
|
//# sourceMappingURL=constants.js.map
|
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const React = tslib_1.__importStar(require("react"));
|
|
5
5
|
const react_core_1 = require("@patternfly/react-core");
|
|
6
6
|
const info_circle_icon_1 = require("@patternfly/react-icons/dist/js/icons/info-circle-icon");
|
|
7
|
-
const
|
|
7
|
+
const react_router_1 = require("react-router");
|
|
8
8
|
const common_1 = require("../../../common");
|
|
9
9
|
const HostsTable_1 = tslib_1.__importDefault(require("../../../common/components/hosts/HostsTable"));
|
|
10
10
|
const tableUtils_1 = require("../Agent/tableUtils");
|
|
@@ -60,7 +60,7 @@ const statusColumn = (agents, bmhs, t) => {
|
|
|
60
60
|
React.createElement(react_core_1.FlexItem, null,
|
|
61
61
|
React.createElement(AgentStatus_1.default, { agent: agent, zIndex: 7000 })),
|
|
62
62
|
React.createElement(react_core_1.FlexItem, { align: { default: 'alignRight' } },
|
|
63
|
-
React.createElement(react_core_1.Popover, { "aria-label": t('ai:Cluster popover'), headerContent: React.createElement("div", null, t('ai:Cannot be deleted')), bodyContent: React.createElement("div", null, t('ai:Hosts that are bound to a cluster cannot be deleted. Remove the host from the cluster and try again.')), footerContent: React.createElement(
|
|
63
|
+
React.createElement(react_core_1.Popover, { "aria-label": t('ai:Cluster popover'), headerContent: React.createElement("div", null, t('ai:Cannot be deleted')), bodyContent: React.createElement("div", null, t('ai:Hosts that are bound to a cluster cannot be deleted. Remove the host from the cluster and try again.')), footerContent: React.createElement(react_router_1.Link, { to: `/multicloud/infrastructure/clusters/details/${clusterName}/` }, t('ai:Go to cluster {{clusterName}}', { clusterName })) },
|
|
64
64
|
React.createElement(react_core_1.Button, { variant: "link", icon: React.createElement(react_core_1.Icon, { status: "info" },
|
|
65
65
|
React.createElement(info_circle_icon_1.InfoCircleIcon, null)) }, t('ai:Cannot be deleted')))))) : (React.createElement(AgentStatus_1.default, { agent: agent }));
|
|
66
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MassDeleteAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/MassDeleteAgentModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAE/B,uDAA+E;AAC/E,6FAAwF;AACxF
|
|
1
|
+
{"version":3,"file":"MassDeleteAgentModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/MassDeleteAgentModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getVipValidationsById = exports.getStorageInitialValues = exports.getHostDiscoveryInitialValues = exports.isSubnetInIPv6 = exports.isDualStack = exports.canBeDualStack = exports.canSelectNetworkTypeSDN = exports.isAdvNetworkConf = exports.clusterNetworksEqual = exports.serviceNetworksEqual = exports.getSubnetFromMachineNetworkCidr = exports.getHostSubnets = exports.getHumanizedSubnet = exports.getHumanizedSubnetRange = exports.getSubnet = exports.getOpenshiftVersionText = void 0;
|
|
3
|
+
exports.getVipValidationsById = exports.getStorageInitialValues = exports.getHostDiscoveryInitialValues = exports.isSubnetInIPv6 = exports.isDualStack = exports.getIPv6FromDualstack = exports.isPrimaryIPv6 = exports.canBeDualStack = exports.canSelectNetworkTypeSDN = exports.isAdvNetworkConf = exports.clusterNetworksEqual = exports.serviceNetworksEqual = exports.getSubnetFromMachineNetworkCidr = exports.getHostSubnets = exports.getHumanizedSubnet = exports.getHumanizedSubnetRange = exports.getSubnet = exports.getOpenshiftVersionText = void 0;
|
|
4
4
|
exports.filterValidationsInfoByGroup = filterValidationsInfoByGroup;
|
|
5
5
|
exports.filterValidationsInfoByStatus = filterValidationsInfoByStatus;
|
|
6
6
|
const ip_address_1 = require("ip-address");
|
|
@@ -120,6 +120,18 @@ exports.canSelectNetworkTypeSDN = canSelectNetworkTypeSDN;
|
|
|
120
120
|
const canBeDualStack = (subnets) => subnets.some((subnet) => ip_address_1.Address4.isValid(subnet.subnet)) &&
|
|
121
121
|
subnets.some((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
122
122
|
exports.canBeDualStack = canBeDualStack;
|
|
123
|
+
const isPrimaryIPv6 = (machineNetworks) => {
|
|
124
|
+
var _a;
|
|
125
|
+
const cidr = (_a = machineNetworks === null || machineNetworks === void 0 ? void 0 : machineNetworks[0]) === null || _a === void 0 ? void 0 : _a.cidr;
|
|
126
|
+
return !!cidr && ip_address_1.Address6.isValid(cidr);
|
|
127
|
+
};
|
|
128
|
+
exports.isPrimaryIPv6 = isPrimaryIPv6;
|
|
129
|
+
/**
|
|
130
|
+
* Find the IPv6 entry in a dualstack network array.
|
|
131
|
+
* Dualstack arrays contain one IPv4 and one IPv6 entry; this helper returns the IPv6 one.
|
|
132
|
+
*/
|
|
133
|
+
const getIPv6FromDualstack = (networks) => networks === null || networks === void 0 ? void 0 : networks.find((n) => n.cidr && ip_address_1.Address6.isValid(n.cidr));
|
|
134
|
+
exports.getIPv6FromDualstack = getIPv6FromDualstack;
|
|
123
135
|
const areNetworksDualStack = (networks, openshiftVersion) => {
|
|
124
136
|
if (!networks || networks.length < 2) {
|
|
125
137
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -239,4 +239,40 @@ const utils_1 = require("./utils");
|
|
|
239
239
|
});
|
|
240
240
|
});
|
|
241
241
|
});
|
|
242
|
+
(0, vitest_1.describe)('getIPv6FromDualstack', () => {
|
|
243
|
+
(0, vitest_1.test)('returns the IPv6 entry from a dualstack array', () => {
|
|
244
|
+
const networks = [
|
|
245
|
+
{ cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' },
|
|
246
|
+
{ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' },
|
|
247
|
+
];
|
|
248
|
+
const result = (0, utils_1.getIPv6FromDualstack)(networks);
|
|
249
|
+
(0, vitest_1.expect)(result).toEqual({ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' });
|
|
250
|
+
});
|
|
251
|
+
(0, vitest_1.test)('returns the IPv6 entry when IPv6 is first', () => {
|
|
252
|
+
const networks = [
|
|
253
|
+
{ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' },
|
|
254
|
+
{ cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' },
|
|
255
|
+
];
|
|
256
|
+
const result = (0, utils_1.getIPv6FromDualstack)(networks);
|
|
257
|
+
(0, vitest_1.expect)(result).toEqual({ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' });
|
|
258
|
+
});
|
|
259
|
+
(0, vitest_1.test)('returns undefined when no IPv6 entry is present', () => {
|
|
260
|
+
const networks = [{ cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' }];
|
|
261
|
+
(0, vitest_1.expect)((0, utils_1.getIPv6FromDualstack)(networks)).toBeUndefined();
|
|
262
|
+
});
|
|
263
|
+
(0, vitest_1.test)('returns undefined for an empty array', () => {
|
|
264
|
+
(0, vitest_1.expect)((0, utils_1.getIPv6FromDualstack)([])).toBeUndefined();
|
|
265
|
+
});
|
|
266
|
+
(0, vitest_1.test)('returns undefined for undefined input', () => {
|
|
267
|
+
(0, vitest_1.expect)((0, utils_1.getIPv6FromDualstack)(undefined)).toBeUndefined();
|
|
268
|
+
});
|
|
269
|
+
(0, vitest_1.test)('works with service networks (no hostPrefix)', () => {
|
|
270
|
+
const networks = [
|
|
271
|
+
{ cidr: '172.30.0.0/16', clusterId: 'test' },
|
|
272
|
+
{ cidr: 'fd02::/112', clusterId: 'test' },
|
|
273
|
+
];
|
|
274
|
+
const result = (0, utils_1.getIPv6FromDualstack)(networks);
|
|
275
|
+
(0, vitest_1.expect)(result).toEqual({ cidr: 'fd02::/112', clusterId: 'test' });
|
|
276
|
+
});
|
|
277
|
+
});
|
|
242
278
|
//# sourceMappingURL=utils.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.test.ts"],"names":[],"mappings":";;AAAA,mCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.test.ts"],"names":[],"mappings":"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"}
|
package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AvailableSubnetsControl = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const react_1 = tslib_1.
|
|
5
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
6
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const formik_1 = require("formik");
|
|
8
8
|
const ip_address_1 = require("ip-address");
|
|
@@ -12,41 +12,28 @@ const use_translation_wrapper_1 = require("../../../hooks/use-translation-wrappe
|
|
|
12
12
|
const SubnetsDropdown_1 = require("./SubnetsDropdown");
|
|
13
13
|
const reorderNetworks_1 = require("./reorderNetworks");
|
|
14
14
|
const subnetSort = (subA, subB) => subA.humanized.localeCompare(subB.humanized);
|
|
15
|
-
const useAutoSelectDefaultMachineNetworks = (autoSelectNetwork, setFieldValue, cidrV4, cidrV6, clusterId, isDualStack) => {
|
|
16
|
-
(0, react_1.useEffect)(() => {
|
|
17
|
-
if (autoSelectNetwork) {
|
|
18
|
-
setFieldValue('machineNetworks', isDualStack
|
|
19
|
-
? [
|
|
20
|
-
{ cidr: cidrV4, clusterId },
|
|
21
|
-
{ cidr: cidrV6, clusterId },
|
|
22
|
-
]
|
|
23
|
-
: [{ cidr: cidrV4, clusterId }], false);
|
|
24
|
-
}
|
|
25
|
-
}, [autoSelectNetwork, cidrV4, cidrV6, clusterId, isDualStack, setFieldValue]);
|
|
26
|
-
};
|
|
27
15
|
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, isViewerMode = false, hosts, isMultiNodeCluster = true, allowSingleStackIPv6 = false, }) => {
|
|
28
|
-
var _a, _b
|
|
16
|
+
var _a, _b;
|
|
29
17
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
30
18
|
const { values, errors, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
31
19
|
const isDualStack = values.stackType === config_1.DUAL_STACK;
|
|
32
20
|
// Check if OCP version supports IPv6 as primary network
|
|
33
21
|
const supportsIPv6Primary = openshiftVersion && (0, utils_1.isMajorMinorVersionEqualOrGreater)(openshiftVersion, '4.12');
|
|
34
|
-
const IPv4Subnets = hostSubnets
|
|
35
|
-
.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet))
|
|
36
|
-
.sort(subnetSort);
|
|
37
|
-
const IPv6Subnets = hostSubnets
|
|
38
|
-
.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet))
|
|
39
|
-
.sort(subnetSort);
|
|
40
22
|
// For OCP >= 4.12, both networks can use either IPv4 or IPv6
|
|
41
|
-
const allSubnets =
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
23
|
+
const { IPv4Subnets, IPv6Subnets, allSubnets } = react_1.default.useMemo(() => {
|
|
24
|
+
const IPv4Subnets = hostSubnets
|
|
25
|
+
.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet))
|
|
26
|
+
.sort(subnetSort);
|
|
27
|
+
const IPv6Subnets = hostSubnets
|
|
28
|
+
.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet))
|
|
29
|
+
.sort(subnetSort);
|
|
30
|
+
const allSubnets = supportsIPv6Primary ? [...IPv4Subnets, ...IPv6Subnets] : IPv4Subnets;
|
|
31
|
+
return {
|
|
32
|
+
IPv4Subnets,
|
|
33
|
+
IPv6Subnets,
|
|
34
|
+
allSubnets,
|
|
35
|
+
};
|
|
36
|
+
}, [hostSubnets, supportsIPv6Primary]);
|
|
50
37
|
// Ensure primary and secondary machine networks are not in the same stack (IPv4/IPv6).
|
|
51
38
|
// If the user switches primary to the same address family as secondary, adjust secondary to the opposite family
|
|
52
39
|
// (or clear it if no subnet is available).
|
|
@@ -100,7 +87,7 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
100
87
|
}))));
|
|
101
88
|
return (react_1.default.createElement(react_core_1.Alert, { title: t('ai:This subnet range is not available on all hosts'), variant: react_core_1.AlertVariant.warning, actionLinks: actionLinks, isInline: true }, t('ai:Hosts outside of this range will not be included in the new cluster.')));
|
|
102
89
|
}, [hosts, isMultiNodeCluster, hostSubnets, t]);
|
|
103
|
-
const primaryNetworkCidr = (
|
|
90
|
+
const primaryNetworkCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
104
91
|
const excludedHostsAlert = getExcludedHostsAlert(primaryNetworkCidr);
|
|
105
92
|
const showSecondaryMachineNetwork = isDualStack && values.machineNetworks && values.machineNetworks.length > 1;
|
|
106
93
|
// Determine available subnets for primary dropdown
|
|
@@ -133,11 +120,22 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
133
120
|
return IPv6Subnets;
|
|
134
121
|
}
|
|
135
122
|
}, [supportsIPv6Primary, primaryNetworkCidr, IPv4Subnets, IPv6Subnets, allSubnets]);
|
|
123
|
+
// Autoselect values in case machineNetworks is empty
|
|
124
|
+
react_1.default.useEffect(() => {
|
|
125
|
+
var _a;
|
|
126
|
+
if (!isViewerMode && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) === 0 && primaryMachineSubnets.length) {
|
|
127
|
+
setFieldValue('machineNetworks', [{ cidr: primaryMachineSubnets[0].subnet, clusterId }]);
|
|
128
|
+
}
|
|
129
|
+
// Run only once
|
|
130
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
131
|
+
}, []);
|
|
136
132
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
137
133
|
react_1.default.createElement(react_core_1.FormGroup, { label: "Machine network", labelInfo: isDualStack && 'Primary', fieldId: "machine-networks", isRequired: isRequired },
|
|
138
134
|
react_1.default.createElement(formik_1.FieldArray, { name: "machineNetworks" }, () => (react_1.default.createElement(react_core_1.Stack, null,
|
|
139
135
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
140
|
-
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: "machineNetworks.0.cidr", machineSubnets: primaryMachineSubnets, isDisabled: isDisabled, onAfterSelect: (newSelection) =>
|
|
136
|
+
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: "machineNetworks.0.cidr", machineSubnets: primaryMachineSubnets, isDisabled: isDisabled, onAfterSelect: (newSelection) => {
|
|
137
|
+
(0, reorderNetworks_1.reorderNetworksForPrimary)(newSelection, values, setFieldValue);
|
|
138
|
+
}, "data-testid": "subnets-dropdown-toggle-primary" })))))),
|
|
141
139
|
showSecondaryMachineNetwork && (react_1.default.createElement(react_core_1.FormGroup, { label: "Machine network", labelInfo: "Secondary", fieldId: "machine-networks-secondary", isRequired: isRequired },
|
|
142
140
|
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: "machineNetworks.1.cidr", machineSubnets: secondaryMachineSubnets, isDisabled: isDisabled, "data-testid": "subnets-dropdown-toggle-secondary" }))),
|
|
143
141
|
react_1.default.createElement(react_1.default.Fragment, null,
|
package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const types_1 = require("../../../types");
|
|
|
10
10
|
const ui_1 = require("../../ui");
|
|
11
11
|
const config_1 = require("../../../config");
|
|
12
12
|
const formik_2 = require("../../ui/formik");
|
|
13
|
-
const ui_2 = require("../../ui");
|
|
14
13
|
const use_translation_wrapper_1 = require("../../../hooks/use-translation-wrapper");
|
|
15
14
|
const reorderNetworks_1 = require("./reorderNetworks");
|
|
16
15
|
const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidrIPv6, values) => {
|
|
@@ -33,32 +32,27 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
33
32
|
const singleStackLabel = allowSingleStackIPv6 ? t('ai:Single stack') : t('ai:IPv4');
|
|
34
33
|
const IPv6Subnets = hostSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
35
34
|
const cidrIPv6 = IPv6Subnets.length >= 1 ? IPv6Subnets[0].subnet : config_1.NO_SUBNET_SET;
|
|
35
|
+
const isSingleStackSelected = values.stackType !== config_1.DUAL_STACK;
|
|
36
36
|
const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === config_1.DUAL_STACK;
|
|
37
37
|
const setSingleStack = react_1.default.useCallback(() => {
|
|
38
38
|
var _a, _b;
|
|
39
39
|
setFieldValue('stackType', config_1.SINGLE_STACK);
|
|
40
|
-
// Determine whether the first machine network is IPv4
|
|
41
40
|
const firstNetwork = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0];
|
|
42
41
|
const isFirstIPv4 = Boolean((firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr));
|
|
43
42
|
if (values.machineNetworks && ((_b = values.machineNetworks) === null || _b === void 0 ? void 0 : _b.length) >= 2) {
|
|
44
|
-
// For single-stack IPv4, prefer IPv4 machine network
|
|
45
43
|
if (isFirstIPv4) {
|
|
46
|
-
// Keep the first network if it's IPv4
|
|
47
44
|
setFieldValue('machineNetworks', [firstNetwork]);
|
|
48
45
|
}
|
|
49
46
|
else {
|
|
50
|
-
// If first is IPv6, look for IPv4 network or set empty for auto-selection
|
|
51
47
|
const ipv4Network = values.machineNetworks.find((network) => network.cidr && ip_address_1.Address4.isValid(network.cidr));
|
|
52
48
|
if (ipv4Network) {
|
|
53
49
|
setFieldValue('machineNetworks', [ipv4Network]);
|
|
54
50
|
}
|
|
55
51
|
else {
|
|
56
|
-
// No IPv4 network found, set empty for auto-selection
|
|
57
52
|
setFieldValue('machineNetworks', []);
|
|
58
53
|
}
|
|
59
54
|
}
|
|
60
55
|
}
|
|
61
|
-
// Set cluster/service to IPv4 defaults when switching to single-stack
|
|
62
56
|
if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
|
|
63
57
|
const defaultCluster = defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
|
|
64
58
|
const firstCluster = values.clusterNetworks[0];
|
|
@@ -66,12 +60,12 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
66
60
|
? {
|
|
67
61
|
cidr: defaultCluster.cidr,
|
|
68
62
|
hostPrefix: defaultCluster.hostPrefix,
|
|
69
|
-
clusterId: firstCluster.clusterId,
|
|
63
|
+
clusterId: firstCluster.clusterId,
|
|
70
64
|
}
|
|
71
65
|
: {
|
|
72
66
|
cidr: '',
|
|
73
67
|
hostPrefix: '',
|
|
74
|
-
clusterId: clusterId,
|
|
68
|
+
clusterId: clusterId,
|
|
75
69
|
};
|
|
76
70
|
setFieldValue('clusterNetworks', [ipv4Cluster]);
|
|
77
71
|
}
|
|
@@ -81,20 +75,18 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
81
75
|
const ipv4Service = defaultService
|
|
82
76
|
? {
|
|
83
77
|
cidr: defaultService.cidr,
|
|
84
|
-
clusterId: firstService.clusterId,
|
|
78
|
+
clusterId: firstService.clusterId,
|
|
85
79
|
}
|
|
86
80
|
: {
|
|
87
81
|
cidr: '',
|
|
88
|
-
clusterId: clusterId,
|
|
82
|
+
clusterId: clusterId,
|
|
89
83
|
};
|
|
90
84
|
setFieldValue('serviceNetworks', [ipv4Service]);
|
|
91
85
|
}
|
|
92
|
-
// Keep only IPv4 VIPs when switching to single-stack (unless DHCP allocation is used)
|
|
93
86
|
if (!values.vipDhcpAllocation) {
|
|
94
87
|
const pruneVips = (vips) => {
|
|
95
88
|
if (!vips || vips.length === 0)
|
|
96
89
|
return [];
|
|
97
|
-
// Choose which index to keep based on whether the first network is IPv4
|
|
98
90
|
const keepIndex = isFirstIPv4 ? 0 : 1;
|
|
99
91
|
const chosen = vips[keepIndex];
|
|
100
92
|
return chosen && chosen.ip
|
|
@@ -126,11 +118,9 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
126
118
|
setFieldValue('networkType', types_1.NETWORK_TYPE_OVN);
|
|
127
119
|
}
|
|
128
120
|
if (values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) < 2) {
|
|
129
|
-
// Ensure IPv4 is primary when switching to dual-stack
|
|
130
121
|
const firstNetwork = values.machineNetworks[0];
|
|
131
122
|
const isFirstIPv6 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address6.isValid(firstNetwork.cidr);
|
|
132
123
|
if (isFirstIPv6) {
|
|
133
|
-
// If first network is IPv6, make IPv4 primary and IPv6 secondary
|
|
134
124
|
const IPv4Subnets = hostSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
|
|
135
125
|
const cidrIPv4 = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : config_1.NO_SUBNET_SET;
|
|
136
126
|
setFieldValue('machineNetworks', [
|
|
@@ -139,7 +129,6 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
139
129
|
], false);
|
|
140
130
|
}
|
|
141
131
|
else {
|
|
142
|
-
// If first network is IPv4, add IPv6 as secondary
|
|
143
132
|
setFieldValue('machineNetworks', [...values.machineNetworks, { cidr: cidrIPv6, clusterId: clusterId }], false);
|
|
144
133
|
}
|
|
145
134
|
}
|
|
@@ -164,7 +153,6 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
164
153
|
};
|
|
165
154
|
setFieldValue('serviceNetworks', [...values.serviceNetworks, secondServiceNetwork], false);
|
|
166
155
|
}
|
|
167
|
-
// Initialize VIPs for dual-stack
|
|
168
156
|
if (values.apiVips && values.apiVips.length < 2) {
|
|
169
157
|
setFieldValue('apiVips', [values.apiVips[0] || { ip: '', clusterId: clusterId }, { ip: '', clusterId: clusterId }], false);
|
|
170
158
|
}
|
|
@@ -175,7 +163,6 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
175
163
|
], false);
|
|
176
164
|
}
|
|
177
165
|
};
|
|
178
|
-
// Ensure cluster/service networks ordering matches the new primary family
|
|
179
166
|
const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
180
167
|
react_1.default.useEffect(() => {
|
|
181
168
|
if (isViewerMode) {
|
|
@@ -191,11 +178,11 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
191
178
|
values.clusterNetworks,
|
|
192
179
|
values.serviceNetworks,
|
|
193
180
|
]);
|
|
194
|
-
const
|
|
195
|
-
if (
|
|
196
|
-
|
|
181
|
+
const handleSingleStackRadioClick = () => {
|
|
182
|
+
if (isSingleStackSelected) {
|
|
183
|
+
return;
|
|
197
184
|
}
|
|
198
|
-
|
|
185
|
+
if (hasDualStackConfigurationChanged(defaultNetworkValues.clusterNetworksDualstack || [], defaultNetworkValues.serviceNetworksDualstack || [], cidrIPv6, values)) {
|
|
199
186
|
setConfirmModal(true);
|
|
200
187
|
}
|
|
201
188
|
else {
|
|
@@ -207,22 +194,24 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
207
194
|
setSingleStack();
|
|
208
195
|
}
|
|
209
196
|
}, [shouldSetSingleStack, setSingleStack]);
|
|
197
|
+
const singleStackPopoverContent = allowSingleStackIPv6
|
|
198
|
+
? t('ai:Select a single address family (IPv4 or IPv6) for your machine network.')
|
|
199
|
+
: t('ai:Select this when your hosts are using only IPv4.');
|
|
200
|
+
const singleStackRadioId = (0, ui_1.getFieldId)('stackType', 'radio', config_1.SINGLE_STACK);
|
|
210
201
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
211
|
-
react_1.default.createElement(react_core_1.FormGroup, { label:
|
|
202
|
+
react_1.default.createElement(react_core_1.FormGroup, { label: t('ai:Networking stack type'), fieldId: (0, ui_1.getFieldId)('stackType', 'radio'), isInline: true },
|
|
212
203
|
react_1.default.createElement(react_core_1.Split, null,
|
|
213
204
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
214
|
-
react_1.default.createElement(
|
|
205
|
+
react_1.default.createElement(react_core_1.Radio, { id: singleStackRadioId, name: "stackType", value: config_1.SINGLE_STACK, label: `${singleStackLabel}\u00A0`, isChecked: isSingleStackSelected, isDisabled: !isDualStackSelectable || isViewerMode, onChange: () => handleSingleStackRadioClick(), "data-testid": "form-radio-stackType-singleStack-field" })),
|
|
215
206
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
216
|
-
react_1.default.createElement(
|
|
217
|
-
? t('ai:Select a single address family (IPv4 or IPv6) for your machine network.')
|
|
218
|
-
: t('ai:Select this when your hosts are using only IPv4.'), buttonStyle: { top: '-4px' } }))),
|
|
207
|
+
react_1.default.createElement(ui_1.PopoverIcon, { bodyContent: singleStackPopoverContent, buttonStyle: { top: '-4px' } }))),
|
|
219
208
|
react_1.default.createElement(react_core_1.Split, null,
|
|
220
209
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
221
210
|
react_1.default.createElement(react_core_1.Tooltip, { content: 'Dual-stack is only available when your hosts are using IPV4 together with IPV6.', hidden: isDualStackSelectable },
|
|
222
|
-
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.DUAL_STACK, isDisabled: !isDualStackSelectable || isViewerMode, label: "Dual-stack\u00A0" }))),
|
|
211
|
+
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.DUAL_STACK, isDisabled: !isDualStackSelectable || isViewerMode, label: "Dual-stack\u00A0", callFormikOnChange: false, onChange: () => setDualStack() }))),
|
|
223
212
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
224
|
-
react_1.default.createElement(
|
|
225
|
-
openConfirmModal && (react_1.default.createElement(
|
|
213
|
+
react_1.default.createElement(ui_1.PopoverIcon, { bodyContent: "Select dual-stack when your hosts are using IPV4 together with IPV6.", buttonStyle: { top: '-4px' } })))),
|
|
214
|
+
openConfirmModal && (react_1.default.createElement(ui_1.ConfirmationModal, { title: 'Change stack type?', titleIconVariant: 'warning', confirmationButtonText: 'Change', confirmationButtonVariant: react_core_1.ButtonVariant.primary, content: react_1.default.createElement("p", null, "All data and configuration done for 'Dual-stack' will be lost."), onClose: () => {
|
|
226
215
|
setConfirmModal(false);
|
|
227
216
|
setDualStack();
|
|
228
217
|
}, onConfirm: () => {
|