@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.
- package/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.d.ts +5 -0
- package/build/@types/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.d.ts.map +1 -0
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts +4 -4
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts.map +1 -1
- package/build/@types/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +2 -2
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.test.d.ts +2 -0
- package/build/@types/cim/components/helpers/versions.test.d.ts.map +1 -0
- package/build/@types/cim/components/modals/CimConfiguration/CimConfigurationModal.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/persist.d.ts +14 -17
- package/build/@types/cim/components/modals/CimConfiguration/persist.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/customManifests/CustomManifestsAlert.d.ts +6 -0
- package/build/@types/common/components/clusterWizard/customManifests/CustomManifestsAlert.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/customManifests/index.d.ts +2 -0
- package/build/@types/common/components/clusterWizard/customManifests/index.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/index.d.ts +2 -0
- package/build/@types/common/components/clusterWizard/index.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.d.ts +3 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/index.d.ts +1 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/index.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/utils.d.ts +1 -0
- package/build/@types/common/components/ui/formik/utils.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts +2 -2
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/common/types/networkType.d.ts +2 -1
- package/build/@types/common/types/networkType.d.ts.map +1 -1
- package/build/@types/common/validationSchemas/networkingValidation.d.ts +10 -0
- package/build/@types/common/validationSchemas/networkingValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.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/ReviewSummary.d.ts.map +1 -1
- package/build/@types/ocm/components/{clusterDetail/ClusterProperties.d.ts → clusterConfiguration/review/utils.d.ts} +1 -8
- package/build/@types/ocm/components/clusterConfiguration/review/utils.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterConfiguration/review/utils.test.d.ts +2 -0
- package/build/@types/ocm/components/clusterConfiguration/review/utils.test.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterDetail/index.d.ts +0 -1
- package/build/@types/ocm/components/clusterDetail/index.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetailsForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/AssistedInstallerHeader.d.ts +5 -1
- package/build/@types/ocm/components/clusters/AssistedInstallerHeader.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useClusterCustomManifests.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useUISettings.d.ts.map +1 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts +2 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js +46 -7
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js +22 -21
- package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js +25 -9
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js +35 -0
- package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js.map +1 -0
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js +13 -18
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js +1 -1
- package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js.map +1 -1
- package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js +1 -4
- package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +39 -28
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.test.js +423 -0
- package/build/cjs/cim/components/helpers/versions.test.js.map +1 -0
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js +39 -16
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js +96 -136
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/customManifests/CustomManifestsAlert.js +32 -0
- package/build/cjs/common/components/clusterWizard/customManifests/CustomManifestsAlert.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/customManifests/index.js +5 -0
- package/build/cjs/common/components/clusterWizard/customManifests/index.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/index.js +2 -0
- package/build/cjs/common/components/clusterWizard/index.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js +8 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js +2 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js +29 -19
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.js +20 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/index.js +1 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/index.js.map +1 -1
- package/build/cjs/common/components/ui/formik/utils.js +5 -1
- package/build/cjs/common/components/ui/formik/utils.js.map +1 -1
- package/build/cjs/common/config/constants.js +13 -2
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/types/networkType.js +9 -8
- package/build/cjs/common/types/networkType.js.map +1 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js +19 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js +4 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.js +1 -20
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.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/NetworkTypeDropdown.js +6 -9
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +4 -4
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js +6 -5
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js +57 -0
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js.map +1 -0
- package/build/cjs/ocm/components/{clusterDetail/ClusterProperties.test.js → clusterConfiguration/review/utils.test.js} +13 -13
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.test.js.map +1 -0
- package/build/cjs/ocm/components/clusterDetail/index.js +1 -3
- package/build/cjs/ocm/components/clusterDetail/index.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js +10 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js.map +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js +2 -2
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js +1 -1
- package/build/cjs/ocm/hooks/useClusterCustomManifests.js +3 -15
- package/build/cjs/ocm/hooks/useClusterCustomManifests.js.map +1 -1
- package/build/cjs/ocm/hooks/useUISettings.js +1 -1
- package/build/cjs/ocm/hooks/useUISettings.js.map +1 -1
- package/build/cjs/ocm/services/ClusterDetailsService.js +4 -2
- package/build/cjs/ocm/services/ClusterDetailsService.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx +55 -6
- package/lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx +18 -2
- package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts +22 -8
- package/lib/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.tsx +81 -0
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +14 -22
- package/lib/cim/components/Hypershift/modals/NodePoolForm.tsx +2 -2
- package/lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx +2 -5
- package/lib/cim/components/helpers/versions.test.ts +465 -0
- package/lib/cim/components/helpers/versions.ts +37 -31
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx +45 -18
- package/lib/cim/components/modals/CimConfiguration/persist.ts +97 -199
- package/lib/cim/types/k8s/agent-cluster-install.ts +1 -1
- package/lib/common/components/clusterWizard/customManifests/CustomManifestsAlert.tsx +39 -0
- package/lib/common/components/clusterWizard/customManifests/index.tsx +1 -0
- package/lib/common/components/clusterWizard/index.ts +2 -0
- package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx +8 -1
- package/lib/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.tsx +2 -2
- package/lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx +36 -26
- package/lib/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.tsx +28 -0
- package/lib/common/components/clusterWizard/networkingSteps/index.ts +1 -0
- package/lib/common/components/ui/formik/utils.ts +6 -0
- package/lib/common/config/constants.ts +14 -1
- package/lib/common/types/networkType.ts +9 -8
- package/lib/common/validationSchemas/networkingValidation.tsx +39 -1
- package/lib/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx +10 -45
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.tsx +7 -24
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -5
- package/lib/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx +10 -4
- package/lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx +9 -2
- package/lib/ocm/components/{clusterDetail/ClusterProperties.test.ts → clusterConfiguration/review/utils.test.ts} +1 -1
- package/lib/ocm/components/clusterConfiguration/review/utils.tsx +61 -0
- package/lib/ocm/components/clusterDetail/index.ts +0 -1
- package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx +10 -1
- package/lib/ocm/components/clusters/AssistedInstallerHeader.tsx +6 -2
- package/lib/ocm/components/clusters/ClusterPage.tsx +1 -1
- package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts +1 -1
- package/lib/ocm/hooks/useClusterCustomManifests.ts +3 -0
- package/lib/ocm/hooks/useUISettings.ts +3 -1
- package/lib/ocm/services/ClusterDetailsService.ts +6 -0
- package/package.json +7 -7
- package/build/@types/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.d.ts +0 -7
- package/build/@types/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts +0 -8
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts +0 -2
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts.map +0 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js +0 -33
- package/build/cjs/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js +0 -40
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js +0 -77
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js.map +0 -1
- package/lib/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.tsx +0 -74
- package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx +0 -69
- package/lib/ocm/components/clusterDetail/ClusterProperties.tsx +0 -169
|
@@ -1,59 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.configureIngressLoadBalancer = exports.editAgentServiceConfig = exports.createAgentServiceConfig = exports.patchProvisioning = void 0;
|
|
4
|
+
exports.isIngressController = isIngressController;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const dynamic_plugin_sdk_1 = require("@openshift-console/dynamic-plugin-sdk");
|
|
6
|
-
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const utils_1 = require("../../../../common/utils");
|
|
8
8
|
const types_1 = require("../../../types");
|
|
9
|
-
const utils_2 = require("
|
|
10
|
-
const utils_3 = require("../../../utils");
|
|
9
|
+
const utils_2 = require("../../../utils");
|
|
11
10
|
const ASSISTED_IMAGE_SERVICE_ROUTE_PREFIX = 'assisted-image-service-multicluster-engine';
|
|
12
|
-
|
|
13
|
-
// Find assisted-image-service's one and parse domain from there.
|
|
14
|
-
const getAssistedImageServiceRoute = (t, setError) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
11
|
+
const getAssistedImageServiceRoute = (t) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
15
12
|
var _a;
|
|
16
13
|
let allRoutes = [];
|
|
17
14
|
try {
|
|
18
15
|
allRoutes = yield (0, dynamic_plugin_sdk_1.k8sListItems)({ model: types_1.RouteModel, queryParams: {} });
|
|
19
16
|
}
|
|
20
17
|
catch (e) {
|
|
21
|
-
|
|
22
|
-
setError({
|
|
23
|
-
title: t('ai:Failed to save configuration'),
|
|
24
|
-
message: t('ai:Can not query routes.'),
|
|
25
|
-
});
|
|
26
|
-
return undefined;
|
|
18
|
+
throw new Error(`${t('ai:Failed to save configuration')}: ${(0, utils_1.getErrorMessage)(e)}`);
|
|
27
19
|
}
|
|
28
20
|
const assistedImageServiceRoute = allRoutes === null || allRoutes === void 0 ? void 0 : allRoutes.find((r) => { var _a; return ((_a = r.metadata) === null || _a === void 0 ? void 0 : _a.name) === 'assisted-image-service'; });
|
|
29
21
|
if (!((_a = assistedImageServiceRoute === null || assistedImageServiceRoute === void 0 ? void 0 : assistedImageServiceRoute.spec) === null || _a === void 0 ? void 0 : _a.host)) {
|
|
30
|
-
|
|
31
|
-
title: t('ai:Failed to save configuration'),
|
|
32
|
-
message: t('ai:Can not find host of the assisted-image-service route'),
|
|
33
|
-
});
|
|
34
|
-
return undefined;
|
|
22
|
+
throw new Error(`${t('ai:Failed to save configuration')}: ${t('ai:Can not find host of the assisted-image-service route')}`);
|
|
35
23
|
}
|
|
36
24
|
return assistedImageServiceRoute;
|
|
37
25
|
});
|
|
38
|
-
|
|
39
|
-
const getClusterDomain = (t, setError, assistedImageServiceRoute) => {
|
|
26
|
+
const getClusterDomain = (t, assistedImageServiceRoute) => {
|
|
40
27
|
var _a;
|
|
41
28
|
const prefix = `${ASSISTED_IMAGE_SERVICE_ROUTE_PREFIX}.`;
|
|
42
29
|
const host = ((_a = assistedImageServiceRoute.spec) === null || _a === void 0 ? void 0 : _a.host) || '';
|
|
43
30
|
const appsDomain = host.substring(host.indexOf(prefix) + prefix.length);
|
|
44
|
-
// the appsDomain can be prefixed either by "apps." or "nlb-apps." so search for first dot
|
|
45
31
|
const domain = appsDomain.substring(appsDomain.indexOf('.') + 1);
|
|
46
32
|
if (!domain) {
|
|
47
|
-
|
|
48
|
-
// console.error('Can not find domain in assistedImageServiceRoute: ', assistedImageServiceRoute);
|
|
49
|
-
setError({
|
|
50
|
-
title: t('ai:Can not find cluster domain.'),
|
|
51
|
-
});
|
|
33
|
+
throw new Error(t('ai:Can not find cluster domain.'));
|
|
52
34
|
}
|
|
53
35
|
return domain;
|
|
54
36
|
};
|
|
55
|
-
|
|
56
|
-
const patchAssistedImageServiceRoute = (t, setError, assistedImageServiceRoute, domain) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
const patchAssistedImageServiceRoute = (t, assistedImageServiceRoute, domain) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
57
38
|
var _a, _b;
|
|
58
39
|
const newHost = `${ASSISTED_IMAGE_SERVICE_ROUTE_PREFIX}.nlb-apps.${domain}`;
|
|
59
40
|
const labels = ((_a = assistedImageServiceRoute.metadata) === null || _a === void 0 ? void 0 : _a.labels) || {};
|
|
@@ -78,30 +59,25 @@ const patchAssistedImageServiceRoute = (t, setError, assistedImageServiceRoute,
|
|
|
78
59
|
});
|
|
79
60
|
}
|
|
80
61
|
catch (e) {
|
|
81
|
-
|
|
82
|
-
setError({
|
|
83
|
-
title: t('ai:Failed to patch assisted-image-service route for new domain.'),
|
|
84
|
-
});
|
|
85
|
-
return false;
|
|
62
|
+
throw new Error(`${t('ai:Failed to patch assisted-image-service route for new domain.')}: ${(0, utils_1.getErrorMessage)(e)}`);
|
|
86
63
|
}
|
|
87
|
-
return true;
|
|
88
64
|
});
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
65
|
+
function isIngressController() {
|
|
66
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
try {
|
|
68
|
+
yield (0, dynamic_plugin_sdk_1.k8sGet)({
|
|
69
|
+
name: 'ingress-controller-with-nlb',
|
|
70
|
+
ns: 'openshift-ingress-operator',
|
|
71
|
+
model: types_1.IngressControllerModel,
|
|
72
|
+
});
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
catch (_a) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
const createIngressController = (t, domain) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
105
81
|
const ingressController = {
|
|
106
82
|
apiVersion: 'operator.openshift.io/v1',
|
|
107
83
|
kind: 'IngressController',
|
|
@@ -132,46 +108,35 @@ const createIngressController = (t, setError, domain) => tslib_1.__awaiter(void
|
|
|
132
108
|
};
|
|
133
109
|
try {
|
|
134
110
|
yield (0, dynamic_plugin_sdk_1.k8sCreate)({ model: types_1.IngressControllerModel, data: ingressController });
|
|
135
|
-
return true;
|
|
136
111
|
}
|
|
137
112
|
catch (e) {
|
|
138
|
-
|
|
139
|
-
setError({
|
|
140
|
-
title: t('ai:Failed to create IngressController'),
|
|
141
|
-
});
|
|
113
|
+
throw new Error(`${t('ai:Failed to create IngressController')}: ${(0, utils_1.getErrorMessage)(e)}`);
|
|
142
114
|
}
|
|
143
|
-
return false;
|
|
144
115
|
});
|
|
145
|
-
const
|
|
146
|
-
var _b;
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
{
|
|
154
|
-
op: ((_b = provisioning.spec) === null || _b === void 0 ? void 0 : _b.watchAllNamespaces) ? 'replace' : 'add',
|
|
155
|
-
path: '/spec/watchAllNamespaces',
|
|
156
|
-
value: true,
|
|
157
|
-
},
|
|
158
|
-
];
|
|
159
|
-
yield (0, dynamic_plugin_sdk_1.k8sPatch)({
|
|
160
|
-
model: types_1.ProvisioningModel,
|
|
161
|
-
resource: provisioning,
|
|
162
|
-
data: patches,
|
|
163
|
-
});
|
|
164
|
-
}
|
|
165
|
-
catch (e) {
|
|
166
|
-
// console.error('Failed to patch provisioning-configuration: ', e);
|
|
167
|
-
setError({
|
|
168
|
-
title: t('ai:Failed to configure provisioning to enable registering hosts via BMC.'),
|
|
169
|
-
message: (0, utils_1.getErrorMessage)(e),
|
|
170
|
-
variant: react_core_1.AlertVariant.warning,
|
|
171
|
-
});
|
|
116
|
+
const patchProvisioning = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
117
|
+
var _a, _b;
|
|
118
|
+
const provisioning = yield (0, dynamic_plugin_sdk_1.k8sGet)({
|
|
119
|
+
model: types_1.ProvisioningModel,
|
|
120
|
+
name: 'provisioning-configuration',
|
|
121
|
+
});
|
|
122
|
+
if ((_a = provisioning.spec) === null || _a === void 0 ? void 0 : _a.watchAllNamespaces) {
|
|
123
|
+
return;
|
|
172
124
|
}
|
|
125
|
+
const patches = [
|
|
126
|
+
{
|
|
127
|
+
op: ((_b = provisioning.spec) === null || _b === void 0 ? void 0 : _b.watchAllNamespaces) === false ? 'replace' : 'add',
|
|
128
|
+
path: '/spec/watchAllNamespaces',
|
|
129
|
+
value: true,
|
|
130
|
+
},
|
|
131
|
+
];
|
|
132
|
+
yield (0, dynamic_plugin_sdk_1.k8sPatch)({
|
|
133
|
+
model: types_1.ProvisioningModel,
|
|
134
|
+
resource: provisioning,
|
|
135
|
+
data: patches,
|
|
136
|
+
});
|
|
173
137
|
});
|
|
174
|
-
|
|
138
|
+
exports.patchProvisioning = patchProvisioning;
|
|
139
|
+
const createAgentServiceConfig = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ t, values, }) {
|
|
175
140
|
try {
|
|
176
141
|
const agentServiceConfig = {
|
|
177
142
|
apiVersion: 'agent-install.openshift.io/v1beta1',
|
|
@@ -185,7 +150,7 @@ const createAgentServiceConfig = (_a) => tslib_1.__awaiter(void 0, [_a], void 0,
|
|
|
185
150
|
accessModes: ['ReadWriteOnce'],
|
|
186
151
|
resources: {
|
|
187
152
|
requests: {
|
|
188
|
-
storage: `${
|
|
153
|
+
storage: `${values.dbVolSize}Gi`,
|
|
189
154
|
},
|
|
190
155
|
},
|
|
191
156
|
},
|
|
@@ -193,7 +158,7 @@ const createAgentServiceConfig = (_a) => tslib_1.__awaiter(void 0, [_a], void 0,
|
|
|
193
158
|
accessModes: ['ReadWriteOnce'],
|
|
194
159
|
resources: {
|
|
195
160
|
requests: {
|
|
196
|
-
storage: `${
|
|
161
|
+
storage: `${values.fsVolSize}Gi`,
|
|
197
162
|
},
|
|
198
163
|
},
|
|
199
164
|
},
|
|
@@ -201,73 +166,68 @@ const createAgentServiceConfig = (_a) => tslib_1.__awaiter(void 0, [_a], void 0,
|
|
|
201
166
|
accessModes: ['ReadWriteOnce'],
|
|
202
167
|
resources: {
|
|
203
168
|
requests: {
|
|
204
|
-
storage: `${
|
|
169
|
+
storage: `${values.imgVolSize}Gi`,
|
|
205
170
|
},
|
|
206
171
|
},
|
|
207
172
|
},
|
|
208
173
|
},
|
|
209
174
|
};
|
|
210
|
-
if (ciscoIntersightURL) {
|
|
211
|
-
agentServiceConfig.metadata = Object.assign(Object.assign({}, agentServiceConfig.metadata), { annotations: { ciscoIntersightURL } });
|
|
175
|
+
if (values.ciscoIntersightURL) {
|
|
176
|
+
agentServiceConfig.metadata = Object.assign(Object.assign({}, agentServiceConfig.metadata), { annotations: { ciscoIntersightURL: values.ciscoIntersightURL } });
|
|
212
177
|
}
|
|
213
178
|
yield (0, dynamic_plugin_sdk_1.k8sCreate)({
|
|
214
179
|
model: types_1.AgentServiceConfigModel,
|
|
215
180
|
data: agentServiceConfig,
|
|
216
181
|
});
|
|
217
|
-
return true;
|
|
218
182
|
}
|
|
219
183
|
catch (e) {
|
|
220
|
-
|
|
221
|
-
title: t('ai:Failed to create AgentServiceConfig'),
|
|
222
|
-
message: (0, utils_1.getErrorMessage)(e),
|
|
223
|
-
});
|
|
224
|
-
return false;
|
|
184
|
+
throw new Error(`${t('ai:Failed to create AgentServiceConfig')}: ${(0, utils_1.getErrorMessage)(e)}`);
|
|
225
185
|
}
|
|
226
186
|
});
|
|
227
|
-
|
|
228
|
-
const
|
|
229
|
-
var _b, _c;
|
|
230
|
-
|
|
231
|
-
|
|
187
|
+
exports.createAgentServiceConfig = createAgentServiceConfig;
|
|
188
|
+
const editAgentServiceConfig = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ t, agentServiceConfig, values, }) {
|
|
189
|
+
var _b, _c, _d, _e, _f;
|
|
190
|
+
const patches = [];
|
|
191
|
+
if (((_c = (_b = agentServiceConfig.metadata) === null || _b === void 0 ? void 0 : _b.annotations) === null || _c === void 0 ? void 0 : _c['ciscoIntersightURL']) &&
|
|
192
|
+
!values.ciscoIntersightURL) {
|
|
193
|
+
patches.push({
|
|
194
|
+
op: 'remove',
|
|
195
|
+
path: '/metadata/annotations/ciscoIntersightURL',
|
|
196
|
+
});
|
|
232
197
|
}
|
|
233
|
-
if (!agentServiceConfig) {
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
imgVolSizeGiB,
|
|
240
|
-
ciscoIntersightURL,
|
|
241
|
-
}))) {
|
|
242
|
-
return false;
|
|
243
|
-
}
|
|
198
|
+
else if (!((_d = agentServiceConfig.metadata) === null || _d === void 0 ? void 0 : _d.annotations) && values.ciscoIntersightURL) {
|
|
199
|
+
patches.push({
|
|
200
|
+
op: 'add',
|
|
201
|
+
path: '/metadata/annotations',
|
|
202
|
+
value: { ciscoIntersightURL: values.ciscoIntersightURL },
|
|
203
|
+
});
|
|
244
204
|
}
|
|
245
|
-
else {
|
|
246
|
-
|
|
247
|
-
(0, utils_3.appendPatch)(patches, '/metadata/annotations/ciscoIntersightURL', ciscoIntersightURL, (_c = (_b = agentServiceConfig.metadata) === null || _b === void 0 ? void 0 : _b.annotations) === null || _c === void 0 ? void 0 : _c['ciscoIntersightURL']);
|
|
248
|
-
yield (0, dynamic_plugin_sdk_1.k8sPatch)({ model: types_1.AgentServiceConfigModel, resource: agentServiceConfig, data: patches });
|
|
205
|
+
else if (values.ciscoIntersightURL) {
|
|
206
|
+
(0, utils_2.appendPatch)(patches, '/metadata/annotations/ciscoIntersightURL', values.ciscoIntersightURL, (_f = (_e = agentServiceConfig.metadata) === null || _e === void 0 ? void 0 : _e.annotations) === null || _f === void 0 ? void 0 : _f['ciscoIntersightURL']);
|
|
249
207
|
}
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
return false;
|
|
260
|
-
}
|
|
261
|
-
const domain = getClusterDomain(t, setError, assistedImageServiceRoute);
|
|
262
|
-
if (!domain) {
|
|
263
|
-
return false;
|
|
264
|
-
}
|
|
265
|
-
if (!(yield createIngressController(t, setError, domain)) ||
|
|
266
|
-
!(yield patchAssistedImageServiceRoute(t, setError, assistedImageServiceRoute, domain))) {
|
|
267
|
-
return false;
|
|
268
|
-
}
|
|
208
|
+
if (patches.length === 0) {
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
try {
|
|
212
|
+
yield (0, dynamic_plugin_sdk_1.k8sPatch)({
|
|
213
|
+
model: types_1.AgentServiceConfigModel,
|
|
214
|
+
resource: agentServiceConfig,
|
|
215
|
+
data: patches,
|
|
216
|
+
});
|
|
269
217
|
}
|
|
270
|
-
|
|
218
|
+
catch (e) {
|
|
219
|
+
throw new Error(`${t('ai:Failed to save configuration')}: ${(0, utils_1.getErrorMessage)(e)}`);
|
|
220
|
+
}
|
|
221
|
+
});
|
|
222
|
+
exports.editAgentServiceConfig = editAgentServiceConfig;
|
|
223
|
+
const configureIngressLoadBalancer = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ t }) {
|
|
224
|
+
if (yield isIngressController()) {
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
const assistedImageServiceRoute = yield getAssistedImageServiceRoute(t);
|
|
228
|
+
const domain = getClusterDomain(t, assistedImageServiceRoute);
|
|
229
|
+
yield createIngressController(t, domain);
|
|
230
|
+
yield patchAssistedImageServiceRoute(t, assistedImageServiceRoute, domain);
|
|
271
231
|
});
|
|
272
|
-
exports.
|
|
232
|
+
exports.configureIngressLoadBalancer = configureIngressLoadBalancer;
|
|
273
233
|
//# sourceMappingURL=persist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/persist.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/modals/CimConfiguration/persist.ts"],"names":[],"mappings":";;;AAmGA,kDAWC;;AA9GD,8EAO+C;AAE/C,oDAA2D;AAE3D,0CAOwB;AACxB,0CAA6C;AAG7C,MAAM,mCAAmC,GAAG,4CAA4C,CAAC;AAEzF,MAAM,4BAA4B,GAAG,CAAO,CAAY,EAA6B,EAAE;;IACrF,IAAI,SAAS,GAAuB,EAAE,CAAC;IACvC,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,IAAA,iCAAY,EAAC,EAAE,KAAK,EAAE,kBAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,iCAAiC,CAAC,KAAK,IAAA,uBAAe,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,MAAM,yBAAyB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAC/C,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,MAAK,wBAAwB,CAAA,EAAA,CACrD,CAAC;IAEF,IAAI,CAAC,CAAA,MAAA,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,IAAI,0CAAE,IAAI,CAAA,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,GAAG,CAAC,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAC3C,0DAA0D,CAC3D,EAAE,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,yBAAyB,CAAC;AACnC,CAAC,CAAA,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAY,EAAE,yBAA2C,EAAE,EAAE;;IACrF,MAAM,MAAM,GAAG,GAAG,mCAAmC,GAAG,CAAC;IACzD,MAAM,IAAI,GAAW,CAAA,MAAA,yBAAyB,CAAC,IAAI,0CAAE,IAAI,KAAI,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CACrC,CAAY,EACZ,yBAA2C,EAC3C,MAAc,EACd,EAAE;;IACF,MAAM,OAAO,GAAG,GAAG,mCAAmC,aAAa,MAAM,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,CAAA,MAAA,yBAAyB,CAAC,QAAQ,0CAAE,MAAM,KAAI,EAAE,CAAC;IAChE,MAAM,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;IAE9B,MAAM,OAAO,GAAY;QACvB;YACE,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,OAAO;SACf;QACD;YACE,EAAE,EAAE,CAAA,MAAA,yBAAyB,CAAC,QAAQ,0CAAE,MAAM,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;YAClE,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,MAAM;SACd;KACF,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAA,6BAAQ,EAAC;YACb,KAAK,EAAE,kBAAU;YACjB,QAAQ,EAAE,yBAAyB;YACnC,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,GAAG,CAAC,CAAC,iEAAiE,CAAC,KAAK,IAAA,uBAAe,EACzF,CAAC,CACF,EAAE,CACJ,CAAC;IACJ,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,SAAsB,mBAAmB;;QACvC,IAAI,CAAC;YACH,MAAM,IAAA,2BAAM,EAAC;gBACX,IAAI,EAAE,6BAA6B;gBACnC,EAAE,EAAE,4BAA4B;gBAChC,KAAK,EAAE,8BAAsB;aAC9B,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAAA;AAED,MAAM,uBAAuB,GAAG,CAAO,CAAY,EAAE,MAAc,EAAE,EAAE;IACrE,MAAM,iBAAiB,GAAG;QACxB,UAAU,EAAE,0BAA0B;QACtC,IAAI,EAAE,mBAAmB;QACzB,QAAQ,EAAE;YACR,IAAI,EAAE,6BAA6B;YACnC,SAAS,EAAE,4BAA4B;SACxC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,YAAY,MAAM,EAAE;YAC5B,aAAa,EAAE;gBACb,WAAW,EAAE;oBACX,aAAa,EAAE,KAAK;iBACrB;aACF;YACD,0BAA0B,EAAE;gBAC1B,IAAI,EAAE,qBAAqB;gBAC3B,YAAY,EAAE;oBACZ,KAAK,EAAE,UAAU;oBACjB,kBAAkB,EAAE;wBAClB,IAAI,EAAE,KAAK;wBACX,GAAG,EAAE;4BACH,IAAI,EAAE,KAAK;yBACZ;qBACF;iBACF;aACF;SACF;KACF,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAA,8BAAS,EAAC,EAAE,KAAK,EAAE,8BAAsB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,uCAAuC,CAAC,KAAK,IAAA,uBAAe,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC;AACH,CAAC,CAAA,CAAC;AAEK,MAAM,iBAAiB,GAAG,GAAS,EAAE;;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAM,EAE/B;QACA,KAAK,EAAE,yBAAiB;QACxB,IAAI,EAAE,4BAA4B;KACnC,CAAC,CAAC;IAEH,IAAI,MAAA,YAAY,CAAC,IAAI,0CAAE,kBAAkB,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG;QACd;YACE,EAAE,EAAE,CAAA,MAAA,YAAY,CAAC,IAAI,0CAAE,kBAAkB,MAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;YACvE,IAAI,EAAE,0BAA0B;YAChC,KAAK,EAAE,IAAI;SACZ;KACF,CAAC;IAEF,MAAM,IAAA,6BAAQ,EAAC;QACb,KAAK,EAAE,yBAAiB;QACxB,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,OAAO;KACd,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAzBW,QAAA,iBAAiB,qBAyB5B;AAEK,MAAM,wBAAwB,GAAG,KAMrC,EAAE,oDAN0C,EAC7C,CAAC,EACD,MAAM,GAIP;IACC,IAAI,CAAC;QACH,MAAM,kBAAkB,GAAG;YACzB,UAAU,EAAE,oCAAoC;YAChD,IAAI,EAAE,oBAAoB;YAC1B,QAAQ,EAAE;gBACR,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,EAAE;aAChB;YACD,IAAI,EAAE;gBACJ,eAAe,EAAE;oBACf,WAAW,EAAE,CAAC,eAAe,CAAC;oBAC9B,SAAS,EAAE;wBACT,QAAQ,EAAE;4BACR,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI;yBACjC;qBACF;iBACF;gBACD,iBAAiB,EAAE;oBACjB,WAAW,EAAE,CAAC,eAAe,CAAC;oBAC9B,SAAS,EAAE;wBACT,QAAQ,EAAE;4BACR,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI;yBACjC;qBACF;iBACF;gBACD,YAAY,EAAE;oBACZ,WAAW,EAAE,CAAC,eAAe,CAAC;oBAC9B,SAAS,EAAE;wBACT,QAAQ,EAAE;4BACR,OAAO,EAAE,GAAG,MAAM,CAAC,UAAU,IAAI;yBAClC;qBACF;iBACF;aACF;SACF,CAAC;QAEF,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC9B,kBAAkB,CAAC,QAAQ,mCACtB,kBAAkB,CAAC,QAAQ,KAC9B,WAAW,EAAE,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE,GAC/D,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,8BAAS,EAAC;YACd,KAAK,EAAE,+BAAuB;YAC9B,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,wCAAwC,CAAC,KAAK,IAAA,uBAAe,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC;AACH,CAAC,CAAA,CAAC;AAzDW,QAAA,wBAAwB,4BAyDnC;AAEK,MAAM,sBAAsB,GAAG,KAQnC,EAAE,oDARwC,EAC3C,CAAC,EACD,kBAAkB,EAClB,MAAM,GAKP;;IACC,MAAM,OAAO,GAAY,EAAE,CAAC;IAE5B,IACE,CAAA,MAAA,MAAA,kBAAkB,CAAC,QAAQ,0CAAE,WAAW,0CAAG,oBAAoB,CAAC;QAChE,CAAC,MAAM,CAAC,kBAAkB,EAC1B,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,0CAA0C;SACjD,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,CAAC,CAAA,MAAA,kBAAkB,CAAC,QAAQ,0CAAE,WAAW,CAAA,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAClF,OAAO,CAAC,IAAI,CAAC;YACX,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE;SACzD,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACrC,IAAA,mBAAW,EACT,OAAO,EACP,0CAA0C,EAC1C,MAAM,CAAC,kBAAkB,EACzB,MAAA,MAAA,kBAAkB,CAAC,QAAQ,0CAAE,WAAW,0CAAG,oBAAoB,CAAC,CACjE,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAA,6BAAQ,EAAC;YACb,KAAK,EAAE,+BAAuB;YAC9B,QAAQ,EAAE,kBAAkB;YAC5B,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,iCAAiC,CAAC,KAAK,IAAA,uBAAe,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC,CAAA,CAAC;AA/CW,QAAA,sBAAsB,0BA+CjC;AAEK,MAAM,4BAA4B,GAAG,KAAgC,EAAE,oDAA3B,EAAE,CAAC,EAAoB;IACxE,IAAI,MAAM,mBAAmB,EAAE,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,yBAAyB,GAAG,MAAM,4BAA4B,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,gBAAgB,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC9D,MAAM,uBAAuB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,8BAA8B,CAAC,CAAC,EAAE,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAC7E,CAAC,CAAA,CAAC;AATW,QAAA,4BAA4B,gCASvC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CustomManifestsAlert = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
|
+
const react_core_1 = require("@patternfly/react-core");
|
|
7
|
+
const hooks_1 = require("../../../hooks");
|
|
8
|
+
const CustomManifestsAlert = ({ usesExternalPlatform, usesThirdPartyCNI, }) => {
|
|
9
|
+
const { t } = (0, hooks_1.useTranslation)();
|
|
10
|
+
let title;
|
|
11
|
+
let body;
|
|
12
|
+
if (usesExternalPlatform && usesExternalPlatform) {
|
|
13
|
+
title = t("ai:You're using an external platform and a third-party CNI");
|
|
14
|
+
body = t('ai:Make sure to upload the required custom and CNI manifests in this step.');
|
|
15
|
+
}
|
|
16
|
+
else if (usesExternalPlatform) {
|
|
17
|
+
title = t("ai:You're using an external platform");
|
|
18
|
+
body = t('ai:Make sure to upload the required custom manifests in this step.');
|
|
19
|
+
}
|
|
20
|
+
else if (usesThirdPartyCNI) {
|
|
21
|
+
title = t("ai:You're using a third-party CNI");
|
|
22
|
+
body = t('ai:Make sure to upload the required CNI manifests in this step.');
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
return (react_1.default.createElement(react_core_1.Stack, null,
|
|
28
|
+
react_1.default.createElement(react_core_1.StackItem, null,
|
|
29
|
+
react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.info, isInline: true, title: title }, body))));
|
|
30
|
+
};
|
|
31
|
+
exports.CustomManifestsAlert = CustomManifestsAlert;
|
|
32
|
+
//# sourceMappingURL=CustomManifestsAlert.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CustomManifestsAlert.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/customManifests/CustomManifestsAlert.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAA+E;AAC/E,0CAAgD;AAEzC,MAAM,oBAAoB,GAAG,CAAC,EACnC,oBAAoB,EACpB,iBAAiB,GAIlB,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,sBAAc,GAAE,CAAC;IAE/B,IAAI,KAAa,CAAC;IAClB,IAAI,IAAY,CAAC;IAEjB,IAAI,oBAAoB,IAAI,oBAAoB,EAAE,CAAC;QACjD,KAAK,GAAG,CAAC,CAAC,4DAA4D,CAAC,CAAC;QACxE,IAAI,GAAG,CAAC,CAAC,4EAA4E,CAAC,CAAC;IACzF,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,KAAK,GAAG,CAAC,CAAC,sCAAsC,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,CAAC,oEAAoE,CAAC,CAAC;IACjF,CAAC;SAAM,IAAI,iBAAiB,EAAE,CAAC;QAC7B,KAAK,GAAG,CAAC,CAAC,mCAAmC,CAAC,CAAC;QAC/C,IAAI,GAAG,CAAC,CAAC,iEAAiE,CAAC,CAAC;IAC9E,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,8BAAC,kBAAK;QACJ,8BAAC,sBAAS;YACR,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,IAAI,EAAE,QAAQ,QAAC,KAAK,EAAE,KAAK,IACrD,IAAI,CACC,CACE,CACN,CACT,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,oBAAoB,wBAkC/B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/customManifests/index.tsx"],"names":[],"mappings":";;;AAAA,iEAAuC"}
|
|
@@ -16,4 +16,6 @@ Object.defineProperty(exports, "HostsValidations", { enumerable: true, get: func
|
|
|
16
16
|
tslib_1.__exportStar(require("./clusterDetailsValidation"), exports);
|
|
17
17
|
tslib_1.__exportStar(require("./types"), exports);
|
|
18
18
|
tslib_1.__exportStar(require("./validationsInfoUtils"), exports);
|
|
19
|
+
tslib_1.__exportStar(require("./customManifests"), exports);
|
|
20
|
+
tslib_1.__exportStar(require("./networkingSteps"), exports);
|
|
19
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;AAAA,qEAA+E;AAAtE,2JAAA,OAAO,OAA2B;AAC3C,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,yFAAmG;AAA1F,+KAAA,OAAO,OAAqC;AACrD,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,yDAA2E;AAAlE,uHAAA,kBAAkB,OAAA;AAAE,qHAAA,gBAAgB,OAAA;AAE7C,qEAA2C;AAC3C,kDAAwB;AACxB,iEAAuC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;AAAA,qEAA+E;AAAtE,2JAAA,OAAO,OAA2B;AAC3C,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,yFAAmG;AAA1F,+KAAA,OAAO,OAAqC;AACrD,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,yDAA2E;AAAlE,uHAAA,kBAAkB,OAAA;AAAE,qHAAA,gBAAgB,OAAA;AAE7C,qEAA2C;AAC3C,kDAAwB;AACxB,iEAAuC;AACvC,4DAAkC;AAClC,4DAAkC"}
|
package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js
CHANGED
|
@@ -24,7 +24,7 @@ const useAutoSelectDefaultMachineNetworks = (autoSelectNetwork, setFieldValue, c
|
|
|
24
24
|
}
|
|
25
25
|
}, [autoSelectNetwork, cidrV4, cidrV6, clusterId, isDualStack, setFieldValue]);
|
|
26
26
|
};
|
|
27
|
-
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, isViewerMode = false, hosts, isMultiNodeCluster = true, }) => {
|
|
27
|
+
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, isViewerMode = false, hosts, isMultiNodeCluster = true, allowSingleStackIPv6 = false, }) => {
|
|
28
28
|
var _a, _b, _c;
|
|
29
29
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
30
30
|
const { values, errors, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
@@ -104,7 +104,13 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
104
104
|
const excludedHostsAlert = getExcludedHostsAlert(primaryNetworkCidr);
|
|
105
105
|
const showSecondaryMachineNetwork = isDualStack && values.machineNetworks && values.machineNetworks.length > 1;
|
|
106
106
|
// Determine available subnets for primary dropdown
|
|
107
|
-
|
|
107
|
+
let primaryMachineSubnets;
|
|
108
|
+
if ((isDualStack && supportsIPv6Primary) || (!isDualStack && allowSingleStackIPv6)) {
|
|
109
|
+
primaryMachineSubnets = allSubnets;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
primaryMachineSubnets = IPv4Subnets;
|
|
113
|
+
}
|
|
108
114
|
// Determine available subnets for secondary dropdown
|
|
109
115
|
const secondaryMachineSubnets = react_1.default.useMemo(() => {
|
|
110
116
|
if (supportsIPv6Primary) {
|
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,uDAAyC;AACzC,uDAQgC;AAChC,mCAAqE;AACrE,2CAAgD;AAGhD,4CAA4D;AAC5D,0CAAmE;AACnE,oFAAwE;AACxE,uDAAoD;AACpD,uDAA8D;AAO9D,MAAM,UAAU,GAAG,CAAC,IAAgB,EAAE,IAAgB,EAAE,EAAE,CACxD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAE/C,MAAM,mCAAmC,GAAG,CAC1C,iBAA0B,EAC1B,aAAyE,EACzE,MAA8B,EAC9B,MAA8B,EAC9B,SAAiB,EACjB,WAAoB,EACpB,EAAE;IACF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE,CAAC;YACtB,aAAa,CACX,iBAAiB,EACjB,WAAW;gBACT,CAAC,CAAC;oBACE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;oBAC3B,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;iBAC5B;gBACH,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EACjC,KAAK,CACN,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js
CHANGED
|
@@ -27,9 +27,9 @@ const ManagedNetworkingControlGroup = ({ disabled = false, tooltipCmnDisabled, t
|
|
|
27
27
|
react_1.default.createElement(react_core_1.Split, null,
|
|
28
28
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
29
29
|
react_1.default.createElement(RadioFieldWithTooltip_1.default, { tooltipProps: tooltipPropsUmn, name: GROUP_NAME, isDisabled: disabled, value: 'userManaged', label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
30
|
-
react_1.default.createElement("span", null, t('ai:User-Managed
|
|
30
|
+
react_1.default.createElement("span", null, t('ai:User-Managed networking')),
|
|
31
31
|
' ',
|
|
32
|
-
react_1.default.createElement(ui_1.PopoverIcon, { bodyContent: t("ai:With User-Managed
|
|
32
|
+
react_1.default.createElement(ui_1.PopoverIcon, { bodyContent: t("ai:With User-Managed networking, you'll need to provide and configure a load balancer for the API and ingress endpoints.") })) })))));
|
|
33
33
|
};
|
|
34
34
|
exports.ManagedNetworkingControlGroup = ManagedNetworkingControlGroup;
|
|
35
35
|
//# sourceMappingURL=ManagedNetworkingControlGroup.js.map
|
|
@@ -11,6 +11,7 @@ const ui_1 = require("../../ui");
|
|
|
11
11
|
const config_1 = require("../../../config");
|
|
12
12
|
const formik_2 = require("../../ui/formik");
|
|
13
13
|
const ui_2 = require("../../ui");
|
|
14
|
+
const use_translation_wrapper_1 = require("../../../hooks/use-translation-wrapper");
|
|
14
15
|
const reorderNetworks_1 = require("./reorderNetworks");
|
|
15
16
|
const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidrIPv6, values) => {
|
|
16
17
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
@@ -24,16 +25,18 @@ const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidr
|
|
|
24
25
|
((_j = (_h = values.apiVips) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.ip) ||
|
|
25
26
|
((_l = (_k = values.ingressVips) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.ip));
|
|
26
27
|
};
|
|
27
|
-
const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode = false, }) => {
|
|
28
|
+
const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode = false, allowSingleStackIPv6 = false, }) => {
|
|
28
29
|
var _a, _b;
|
|
30
|
+
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
29
31
|
const { setFieldValue, values, validateForm } = (0, formik_1.useFormikContext)();
|
|
30
32
|
const [openConfirmModal, setConfirmModal] = react_1.default.useState(false);
|
|
33
|
+
const singleStackLabel = allowSingleStackIPv6 ? t('ai:Single stack') : t('ai:IPv4');
|
|
31
34
|
const IPv6Subnets = hostSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
32
35
|
const cidrIPv6 = IPv6Subnets.length >= 1 ? IPv6Subnets[0].subnet : config_1.NO_SUBNET_SET;
|
|
33
36
|
const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === config_1.DUAL_STACK;
|
|
34
37
|
const setSingleStack = react_1.default.useCallback(() => {
|
|
35
38
|
var _a, _b;
|
|
36
|
-
setFieldValue('stackType', config_1.
|
|
39
|
+
setFieldValue('stackType', config_1.SINGLE_STACK);
|
|
37
40
|
// Determine whether the first machine network is IPv4
|
|
38
41
|
const firstNetwork = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0];
|
|
39
42
|
const isFirstIPv4 = Boolean((firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr));
|
|
@@ -55,7 +58,7 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
|
-
//
|
|
61
|
+
// Set cluster/service to IPv4 defaults when switching to single-stack
|
|
59
62
|
if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
|
|
60
63
|
const defaultCluster = defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
|
|
61
64
|
const firstCluster = values.clusterNetworks[0];
|
|
@@ -116,7 +119,7 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
116
119
|
values.vipDhcpAllocation,
|
|
117
120
|
]);
|
|
118
121
|
const setDualStack = () => {
|
|
119
|
-
var _a, _b, _c, _d, _e;
|
|
122
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
120
123
|
setFieldValue('stackType', config_1.DUAL_STACK);
|
|
121
124
|
setFieldValue('vipDhcpAllocation', false);
|
|
122
125
|
if (values.networkType === types_1.NETWORK_TYPE_SDN) {
|
|
@@ -141,20 +144,25 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
141
144
|
}
|
|
142
145
|
}
|
|
143
146
|
if (values.clusterNetworks && ((_b = values.clusterNetworks) === null || _b === void 0 ? void 0 : _b.length) < 2) {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
147
|
+
const firstClusterCidr = (_c = values.clusterNetworks[0]) === null || _c === void 0 ? void 0 : _c.cidr;
|
|
148
|
+
const isPrimaryIPv6 = firstClusterCidr && ip_address_1.Address6.isValid(firstClusterCidr);
|
|
149
|
+
const missingFamilyNetworkDefault = (_d = defaultNetworkValues.clusterNetworksDualstack) === null || _d === void 0 ? void 0 : _d[isPrimaryIPv6 ? 0 : 1];
|
|
150
|
+
const secondClusterNetwork = missingFamilyNetworkDefault !== null && missingFamilyNetworkDefault !== void 0 ? missingFamilyNetworkDefault : {
|
|
151
|
+
cidr: '',
|
|
152
|
+
hostPrefix: '',
|
|
153
|
+
clusterId: clusterId,
|
|
154
|
+
};
|
|
155
|
+
setFieldValue('clusterNetworks', [...values.clusterNetworks, secondClusterNetwork], false);
|
|
150
156
|
}
|
|
151
|
-
if (values.serviceNetworks && ((
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
157
|
+
if (values.serviceNetworks && ((_e = values.serviceNetworks) === null || _e === void 0 ? void 0 : _e.length) < 2) {
|
|
158
|
+
const firstServiceCidr = (_f = values.serviceNetworks[0]) === null || _f === void 0 ? void 0 : _f.cidr;
|
|
159
|
+
const isPrimaryIPv6 = firstServiceCidr && ip_address_1.Address6.isValid(firstServiceCidr);
|
|
160
|
+
const missingFamilyNetworkDefault = (_g = defaultNetworkValues.serviceNetworksDualstack) === null || _g === void 0 ? void 0 : _g[isPrimaryIPv6 ? 0 : 1];
|
|
161
|
+
const secondServiceNetwork = missingFamilyNetworkDefault !== null && missingFamilyNetworkDefault !== void 0 ? missingFamilyNetworkDefault : {
|
|
162
|
+
cidr: '',
|
|
163
|
+
clusterId: clusterId,
|
|
164
|
+
};
|
|
165
|
+
setFieldValue('serviceNetworks', [...values.serviceNetworks, secondServiceNetwork], false);
|
|
158
166
|
}
|
|
159
167
|
// Initialize VIPs for dual-stack
|
|
160
168
|
if (values.apiVips && values.apiVips.length < 2) {
|
|
@@ -203,9 +211,11 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
203
211
|
react_1.default.createElement(react_core_1.FormGroup, { label: "Networking stack type", fieldId: (0, ui_1.getFieldId)('stackType', 'radio'), onChange: setStackType, isInline: true },
|
|
204
212
|
react_1.default.createElement(react_core_1.Split, null,
|
|
205
213
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
206
|
-
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.
|
|
214
|
+
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.SINGLE_STACK, isDisabled: !isDualStackSelectable || isViewerMode, label: `${singleStackLabel}\u00A0` })),
|
|
207
215
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
208
|
-
react_1.default.createElement(ui_2.PopoverIcon, { bodyContent:
|
|
216
|
+
react_1.default.createElement(ui_2.PopoverIcon, { bodyContent: allowSingleStackIPv6
|
|
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' } }))),
|
|
209
219
|
react_1.default.createElement(react_core_1.Split, null,
|
|
210
220
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
211
221
|
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 },
|