@openshift-assisted/ui-lib 2.12.0-cim → 2.13.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/Agent/NoAgentsAlert.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ACMClusterDeploymentDetailsStep.d.ts +2 -0
- package/build/@types/cim/components/ClusterDeployment/ACMClusterDeploymentDetailsStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.d.ts +2 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.d.ts +3 -5
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts +1 -0
- package/build/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/EnvironmentDetails.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts +5 -1
- package/build/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/InfraTableToolbar.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/OpenshiftVersionDropdown.d.ts +6 -0
- package/build/@types/cim/components/InfraEnv/OpenshiftVersionDropdown.d.ts.map +1 -0
- package/build/@types/cim/components/common/CpuArchitectureDropdown.d.ts +6 -0
- package/build/@types/cim/components/common/CpuArchitectureDropdown.d.ts.map +1 -0
- package/build/@types/cim/components/helpers/agentStatus.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/clusterDeployment.d.ts +1 -1
- package/build/@types/cim/components/helpers/clusterDeployment.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/types/k8s/agent-service-config.d.ts +7 -0
- package/build/@types/cim/types/k8s/agent-service-config.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/infra-env-k8s-resource.d.ts +2 -1
- package/build/@types/cim/types/k8s/infra-env-k8s-resource.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/clusterDetailsValidation.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/types.d.ts +1 -0
- package/build/@types/common/components/clusterWizard/types.d.ts.map +1 -1
- package/build/@types/common/components/hosts/utils.d.ts.map +1 -1
- package/build/@types/common/types/cpuArchitecture.d.ts +6 -0
- package/build/@types/common/types/cpuArchitecture.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts +1 -7
- package/build/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/featureSupportLevels/featureStateUtils.d.ts.map +1 -1
- package/build/@types/ocm/store/slices/current-cluster/slice.d.ts +1 -1
- package/build/cjs/cim/components/Agent/NoAgentsAlert.js +10 -5
- package/build/cjs/cim/components/Agent/NoAgentsAlert.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ACMClusterDeploymentDetailsStep.js +7 -6
- package/build/cjs/cim/components/ClusterDeployment/ACMClusterDeploymentDetailsStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.js +19 -4
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.js +4 -5
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js +3 -3
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js +12 -8
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/InfraEnvFormPage.js +6 -10
- package/build/cjs/cim/components/InfraEnv/InfraEnvFormPage.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/InfraTableToolbar.js +1 -4
- package/build/cjs/cim/components/InfraEnv/InfraTableToolbar.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/OpenshiftVersionDropdown.js +34 -0
- package/build/cjs/cim/components/InfraEnv/OpenshiftVersionDropdown.js.map +1 -0
- package/build/cjs/cim/components/common/CpuArchitectureDropdown.js +46 -0
- package/build/cjs/cim/components/common/CpuArchitectureDropdown.js.map +1 -0
- package/build/cjs/cim/components/helpers/agentStatus.js +5 -0
- package/build/cjs/cim/components/helpers/agentStatus.js.map +1 -1
- package/build/cjs/cim/components/helpers/clusterDeployment.js +8 -1
- package/build/cjs/cim/components/helpers/clusterDeployment.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +6 -1
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js +1 -0
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js.map +1 -1
- package/build/cjs/common/components/hosts/utils.js +1 -0
- package/build/cjs/common/components/hosts/utils.js.map +1 -1
- package/build/cjs/common/components/ui/formik/LabelField.css +5 -0
- package/build/cjs/common/types/cpuArchitecture.js +22 -1
- package/build/cjs/common/types/cpuArchitecture.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js +5 -27
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js +2 -4
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.js +1 -2
- package/build/cjs/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js +1 -2
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js.map +1 -1
- package/lib/cim/components/Agent/NoAgentsAlert.tsx +8 -4
- package/lib/cim/components/ClusterDeployment/ACMClusterDeploymentDetailsStep.tsx +17 -3
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx +30 -4
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.tsx +9 -9
- package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx +5 -3
- package/lib/cim/components/InfraEnv/EnvironmentDetails.tsx +18 -2
- package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx +15 -22
- package/lib/cim/components/InfraEnv/InfraTableToolbar.tsx +1 -3
- package/lib/cim/components/InfraEnv/OpenshiftVersionDropdown.tsx +71 -0
- package/lib/cim/components/common/CpuArchitectureDropdown.tsx +93 -0
- package/lib/cim/components/helpers/agentStatus.tsx +5 -0
- package/lib/cim/components/helpers/clusterDeployment.ts +8 -1
- package/lib/cim/components/helpers/versions.ts +12 -0
- package/lib/cim/types/k8s/agent-service-config.ts +8 -0
- package/lib/cim/types/k8s/infra-env-k8s-resource.ts +2 -1
- package/lib/common/components/clusterWizard/clusterDetailsValidation.ts +1 -0
- package/lib/common/components/clusterWizard/types.ts +1 -0
- package/lib/common/components/hosts/utils.ts +2 -0
- package/lib/common/components/ui/formik/LabelField.css +5 -0
- package/lib/common/types/cpuArchitecture.ts +28 -0
- package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx +2 -33
- package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx +4 -7
- package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx +1 -1
- package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts +1 -1
- package/package.json +3 -3
- package/build/@types/cim/components/ClusterDeployment/ArmCheckbox.d.ts +0 -8
- package/build/@types/cim/components/ClusterDeployment/ArmCheckbox.d.ts.map +0 -1
- package/build/cjs/cim/components/ClusterDeployment/ArmCheckbox.js +0 -44
- package/build/cjs/cim/components/ClusterDeployment/ArmCheckbox.js.map +0 -1
- package/lib/cim/components/ClusterDeployment/ArmCheckbox.tsx +0 -101
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDisabledReasonForCpuArch = exports.getDefaultCpuArchitecture = exports.getSupportedCpuArchitectures = exports.getAllCpuArchitectures = exports.featureIdToCpuArchitecture = exports.OcmCpuArchitecture = exports.CpuArchitecture = void 0;
|
|
3
|
+
exports.getDisabledReasonForCpuArch = exports.getDefaultCpuArchitecture = exports.getSupportedCpuArchitectures = exports.architectureData = exports.getAllCpuArchitectures = exports.featureIdToCpuArchitecture = exports.OcmCpuArchitecture = exports.CpuArchitecture = void 0;
|
|
4
4
|
var CpuArchitecture;
|
|
5
5
|
(function (CpuArchitecture) {
|
|
6
6
|
CpuArchitecture["x86"] = "x86_64";
|
|
@@ -34,6 +34,27 @@ const getAllCpuArchitectures = () => [
|
|
|
34
34
|
CpuArchitecture.s390x,
|
|
35
35
|
];
|
|
36
36
|
exports.getAllCpuArchitectures = getAllCpuArchitectures;
|
|
37
|
+
exports.architectureData = {
|
|
38
|
+
[CpuArchitecture.x86]: {
|
|
39
|
+
description: '',
|
|
40
|
+
label: 'x86_64',
|
|
41
|
+
},
|
|
42
|
+
[CpuArchitecture.ARM]: {
|
|
43
|
+
description: 'Some features may not be available',
|
|
44
|
+
featureSupportLevelId: 'ARM64_ARCHITECTURE',
|
|
45
|
+
label: 'Arm64',
|
|
46
|
+
},
|
|
47
|
+
[CpuArchitecture.ppc64le]: {
|
|
48
|
+
description: 'Some features may not be available',
|
|
49
|
+
featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
|
|
50
|
+
label: 'IBM Power (ppc64le)',
|
|
51
|
+
},
|
|
52
|
+
[CpuArchitecture.s390x]: {
|
|
53
|
+
description: 'Some features may not be available',
|
|
54
|
+
featureSupportLevelId: 'S390X_ARCHITECTURE',
|
|
55
|
+
label: 'IBM Z (s390x)',
|
|
56
|
+
},
|
|
57
|
+
};
|
|
37
58
|
const getSupportedCpuArchitectures = (cpuArchitectures, day1CpuArchitecture) => {
|
|
38
59
|
const newSupportedCpuArchs = [];
|
|
39
60
|
//Power/Z clusters can be only homogeneous clusters
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpuArchitecture.js","sourceRoot":"","sources":["../../../../lib/common/types/cpuArchitecture.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cpuArchitecture.js","sourceRoot":"","sources":["../../../../lib/common/types/cpuArchitecture.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.architectureData = void 0;
|
|
4
3
|
const tslib_1 = require("tslib");
|
|
5
4
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
5
|
const react_core_1 = require("@patternfly/react-core");
|
|
@@ -10,27 +9,6 @@ const common_1 = require("../../../common");
|
|
|
10
9
|
const newFeatureSupportLevels_1 = require("../../../common/components/newFeatureSupportLevels");
|
|
11
10
|
const useSupportLevelsAPI_1 = tslib_1.__importDefault(require("../../hooks/useSupportLevelsAPI"));
|
|
12
11
|
const constants_1 = require("./platformIntegration/constants");
|
|
13
|
-
exports.architectureData = {
|
|
14
|
-
[common_1.CpuArchitecture.x86]: {
|
|
15
|
-
description: '',
|
|
16
|
-
label: 'x86_64',
|
|
17
|
-
},
|
|
18
|
-
[common_1.CpuArchitecture.ARM]: {
|
|
19
|
-
description: 'Some features may not be available',
|
|
20
|
-
featureSupportLevelId: 'ARM64_ARCHITECTURE',
|
|
21
|
-
label: 'Arm64',
|
|
22
|
-
},
|
|
23
|
-
[common_1.CpuArchitecture.ppc64le]: {
|
|
24
|
-
description: 'Some features may not be available',
|
|
25
|
-
featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
|
|
26
|
-
label: 'IBM Power (ppc64le)',
|
|
27
|
-
},
|
|
28
|
-
[common_1.CpuArchitecture.s390x]: {
|
|
29
|
-
description: 'Some features may not be available',
|
|
30
|
-
featureSupportLevelId: 'S390X_ARCHITECTURE',
|
|
31
|
-
label: 'IBM Z (s390x)',
|
|
32
|
-
},
|
|
33
|
-
};
|
|
34
12
|
const INPUT_NAME = 'cpuArchitecture';
|
|
35
13
|
const fieldId = (0, common_1.getFieldId)(INPUT_NAME, 'input');
|
|
36
14
|
const isCurrentDefaultCpuArchitecture = (cpuArchitectures, cpuArchitecture, day1CpuArchitecture) => {
|
|
@@ -44,7 +22,7 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
44
22
|
const [field, { value: selectedCpuArchitecture }, { setValue }] = (0, formik_1.useField)(INPUT_NAME);
|
|
45
23
|
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
46
24
|
const prevVersionRef = react_1.default.useRef(openshiftVersion);
|
|
47
|
-
const [currentCpuArch, setCurrentCpuArch] = react_1.default.useState(day1CpuArchitecture ?
|
|
25
|
+
const [currentCpuArch, setCurrentCpuArch] = react_1.default.useState(day1CpuArchitecture ? common_1.architectureData[day1CpuArchitecture].label : common_1.CpuArchitecture.x86);
|
|
48
26
|
const supportLevelDataForAllCpuArchs = (0, useSupportLevelsAPI_1.default)('featureForAllCpus', openshiftVersion, undefined, platformType, cpuArchitectures);
|
|
49
27
|
const enabledItems = react_1.default.useMemo(() => {
|
|
50
28
|
if (cpuArchitectures !== undefined) {
|
|
@@ -60,11 +38,11 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
60
38
|
const featureSupportLevelData = supportLevelDataForAllCpuArchs[cpuArch];
|
|
61
39
|
isCpuSupported = newFeatureSupportLevelContext.isFeatureSupported(constants_1.ExternalPlaformIds[platformType ? platformType : 'baremetal'], featureSupportLevelData !== null && featureSupportLevelData !== void 0 ? featureSupportLevelData : undefined);
|
|
62
40
|
}
|
|
63
|
-
return (react_1.default.createElement(react_core_1.DropdownItem, { key: cpuArch, id: cpuArch, description: cpuArch ?
|
|
41
|
+
return (react_1.default.createElement(react_core_1.DropdownItem, { key: cpuArch, id: cpuArch, description: cpuArch ? common_1.architectureData[cpuArch].description : '', isAriaDisabled: !isCpuSupported },
|
|
64
42
|
react_1.default.createElement(react_core_1.Split, null,
|
|
65
43
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
66
44
|
react_1.default.createElement(react_core_1.Tooltip, { hidden: isCpuSupported, content: disabledReason, position: "top" },
|
|
67
|
-
react_1.default.createElement("div", null, cpuArch ?
|
|
45
|
+
react_1.default.createElement("div", null, cpuArch ? common_1.architectureData[cpuArch].label : ''))),
|
|
68
46
|
react_1.default.createElement(react_core_1.SplitItem, { isFilled: true }))));
|
|
69
47
|
});
|
|
70
48
|
}
|
|
@@ -79,14 +57,14 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
79
57
|
const selectedCpuArch = event === null || event === void 0 ? void 0 : event.currentTarget.id;
|
|
80
58
|
setValue(selectedCpuArch);
|
|
81
59
|
setOpen(false);
|
|
82
|
-
setCurrentCpuArch(
|
|
60
|
+
setCurrentCpuArch(common_1.architectureData[selectedCpuArch].label);
|
|
83
61
|
onChange && onChange(selectedCpuArch);
|
|
84
62
|
}, [setOpen, setValue, onChange]);
|
|
85
63
|
react_1.default.useEffect(() => {
|
|
86
64
|
const isCurrentDefaultCpuArchitectureSelected = isCurrentDefaultCpuArchitecture(cpuArchitectures, selectedCpuArchitecture, day1CpuArchitecture);
|
|
87
65
|
if (isCurrentDefaultCpuArchitectureSelected) {
|
|
88
66
|
setValue((0, common_1.getDefaultCpuArchitecture)());
|
|
89
|
-
setCurrentCpuArch(
|
|
67
|
+
setCurrentCpuArch(common_1.architectureData[(0, common_1.getDefaultCpuArchitecture)()].label);
|
|
90
68
|
setOpen(false);
|
|
91
69
|
}
|
|
92
70
|
if (prevVersionRef.current !== openshiftVersion) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const OcmFormFields_1 = require("../ui/OcmFormFields");
|
|
|
13
13
|
const OcmOpenShiftVersion_1 = tslib_1.__importDefault(require("./OcmOpenShiftVersion"));
|
|
14
14
|
const OcmOpenShiftVersionSelect_1 = tslib_1.__importDefault(require("./OcmOpenShiftVersionSelect"));
|
|
15
15
|
const CustomManifestCheckbox_1 = tslib_1.__importDefault(require("./CustomManifestCheckbox"));
|
|
16
|
-
const CpuArchitectureDropdown_1 = tslib_1.
|
|
16
|
+
const CpuArchitectureDropdown_1 = tslib_1.__importDefault(require("./CpuArchitectureDropdown"));
|
|
17
17
|
const OcmBaseDomainField_1 = require("./OcmBaseDomainField");
|
|
18
18
|
const OcmSNOControlGroup_1 = tslib_1.__importDefault(require("./OcmSNOControlGroup"));
|
|
19
19
|
const useSupportLevelsAPI_1 = tslib_1.__importDefault(require("../../hooks/useSupportLevelsAPI"));
|
|
@@ -37,9 +37,7 @@ const OcmClusterDetailsFormFields = ({ managedDomains = [], versions, isPullSecr
|
|
|
37
37
|
const clusterWizardContext = (0, ClusterWizardContext_1.useClusterWizardContext)();
|
|
38
38
|
const featureSupportLevelData = (0, useSupportLevelsAPI_1.default)('features', values.openshiftVersion, values.cpuArchitecture);
|
|
39
39
|
const cpuArchitectures = React.useMemo(() => (0, common_1.getSupportedCpuArchitectures)(cpuArchitecturesByVersionImage), [cpuArchitecturesByVersionImage]);
|
|
40
|
-
|
|
41
|
-
// @ts-ignore
|
|
42
|
-
const cpuArchitecture = CpuArchitectureDropdown_1.architectureData[values.cpuArchitecture].label;
|
|
40
|
+
const cpuArchitecture = common_1.architectureData[values.cpuArchitecture].label;
|
|
43
41
|
const featureSupportLevelContext = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
|
|
44
42
|
React.useEffect(() => {
|
|
45
43
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcmClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,uDAA8C;AAC9C,mCAA0C;AAE1C,mGAAgG;AAChG,
|
|
1
|
+
{"version":3,"file":"OcmClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const formik_1 = require("formik");
|
|
|
9
9
|
const common_1 = require("../../../../common");
|
|
10
10
|
const constants_1 = require("./constants");
|
|
11
11
|
const newFeatureSupportLevels_1 = require("../../../../common/components/newFeatureSupportLevels");
|
|
12
|
-
const CpuArchitectureDropdown_1 = require("../CpuArchitectureDropdown");
|
|
13
12
|
const NewFeatureSupportLevelBadge_1 = tslib_1.__importDefault(require("../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge"));
|
|
14
13
|
const INPUT_NAME = 'platform';
|
|
15
14
|
const fieldId = (0, common_1.getFieldId)(INPUT_NAME, 'input');
|
|
@@ -52,7 +51,7 @@ const ExternalPlatformDropdown = ({ showOciOption, onChange, cpuArchitecture, fe
|
|
|
52
51
|
const [field, , { setValue }] = (0, formik_1.useField)(INPUT_NAME);
|
|
53
52
|
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
54
53
|
const [externalPlatformTypes, setExternalPlatformTypes] = react_1.default.useState({});
|
|
55
|
-
const tooltipDropdownDisabled = getReasonForDropdownDisabled(isSNO, cpuArchitecture ?
|
|
54
|
+
const tooltipDropdownDisabled = getReasonForDropdownDisabled(isSNO, cpuArchitecture ? common_1.architectureData[cpuArchitecture].label : '');
|
|
56
55
|
const handleClick = (event, href) => {
|
|
57
56
|
event.stopPropagation(); // Stop event propagation here
|
|
58
57
|
window.open(href, '_blank');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalPlatformDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0C;AAC1C,uDAUgC;AAChC,2FAAsF;AACtF,mCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"ExternalPlatformDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getLvmsIncompatibleWithOdfReason = exports.getOdfIncompatibleWithLvmsReason = exports.hostsNetworkConfigurationDisabledReason = exports.isFeatureSupportedAndAvailable = exports.getNewFeatureDisabledReason = exports.getLvmIncompatibleWithCnvReason = exports.getCnvIncompatibleWithLvmReason = exports.clusterExistsReason = void 0;
|
|
4
4
|
const common_1 = require("../../../common");
|
|
5
|
-
const CpuArchitectureDropdown_1 = require("../clusterConfiguration/CpuArchitectureDropdown");
|
|
6
5
|
const constants_1 = require("../clusterConfiguration/platformIntegration/constants");
|
|
7
6
|
const CNV_OPERATOR_LABEL = 'Openshift Virtualization';
|
|
8
7
|
const LVMS_OPERATOR_LABEL = 'Logical Volume Manager Storage';
|
|
@@ -73,7 +72,7 @@ const getCnvDisabledReason = (activeFeatureConfiguration, isSupported) => {
|
|
|
73
72
|
return undefined;
|
|
74
73
|
}
|
|
75
74
|
if (!isSupported) {
|
|
76
|
-
const cpuArchitectureLabel =
|
|
75
|
+
const cpuArchitectureLabel = common_1.architectureData[activeFeatureConfiguration.underlyingCpuArchitecture].label;
|
|
77
76
|
return `${CNV_OPERATOR_LABEL} is not available when ${cpuArchitectureLabel
|
|
78
77
|
? cpuArchitectureLabel
|
|
79
78
|
: activeFeatureConfiguration.underlyingCpuArchitecture} CPU architecture is selected.`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureStateUtils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/featureSupportLevels/featureStateUtils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"featureStateUtils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/featureSupportLevels/featureStateUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Alert, AlertVariant, List, ListComponent, ListItem } from '@patternfly/
|
|
|
3
3
|
import { Link } from 'react-router-dom-v5-compat';
|
|
4
4
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
5
5
|
import { Trans } from 'react-i18next';
|
|
6
|
-
import { CpuArchitecture } from '../../../common';
|
|
6
|
+
import { architectureData, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
|
|
7
7
|
|
|
8
8
|
const NoAgentsAlert = ({ cpuArchitecture }: { cpuArchitecture: CpuArchitecture }) => {
|
|
9
9
|
const { t } = useTranslation();
|
|
@@ -11,19 +11,23 @@ const NoAgentsAlert = ({ cpuArchitecture }: { cpuArchitecture: CpuArchitecture }
|
|
|
11
11
|
<Alert
|
|
12
12
|
variant={AlertVariant.warning}
|
|
13
13
|
title={t('ai:No available hosts with {{cpuArchitecture}} architecture were found', {
|
|
14
|
-
cpuArchitecture,
|
|
14
|
+
cpuArchitecture: architectureData[cpuArchitecture as SupportedCpuArchitecture].label,
|
|
15
15
|
})}
|
|
16
16
|
isInline
|
|
17
17
|
>
|
|
18
18
|
{t(
|
|
19
19
|
'ai:The cluster can not be installed yet because there are no available hosts with {{cpuArchitecture}} architecture found. To continue:',
|
|
20
|
-
{ cpuArchitecture },
|
|
20
|
+
{ cpuArchitecture: architectureData[cpuArchitecture as SupportedCpuArchitecture].label },
|
|
21
21
|
)}
|
|
22
22
|
<br />
|
|
23
23
|
<List component={ListComponent.ol}>
|
|
24
24
|
<ListItem>
|
|
25
25
|
<Trans t={t} cpuArchitecture={cpuArchitecture}>
|
|
26
|
-
ai:Add hosts with
|
|
26
|
+
ai:Add hosts with{' '}
|
|
27
|
+
{{
|
|
28
|
+
cpuArchitecture: architectureData[cpuArchitecture as SupportedCpuArchitecture].label,
|
|
29
|
+
}}{' '}
|
|
30
|
+
architecture to an{' '}
|
|
27
31
|
<Link to="/multicloud/infrastructure/environments">infrastructure environment</Link>
|
|
28
32
|
</Trans>
|
|
29
33
|
</ListItem>
|
|
@@ -7,11 +7,14 @@ import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
|
|
|
7
7
|
import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
|
|
8
8
|
import { useDetailsFormik } from './ClusterDeploymentDetailsStep';
|
|
9
9
|
import { ClusterDetailsFormFieldsProps } from './ClusterDetailsFormFields';
|
|
10
|
+
import { OsImage } from '../../types';
|
|
11
|
+
import { getOCPVersions } from '../helpers';
|
|
10
12
|
|
|
11
13
|
type DetailsFormBodyProps = {
|
|
12
14
|
clusterImages: ClusterImageSetK8sResource[];
|
|
13
15
|
onValuesChanged: (values: ClusterDetailsValues, initRender: boolean) => void;
|
|
14
16
|
extensionAfter: ClusterDetailsFormFieldsProps['extensionAfter'];
|
|
17
|
+
osImages?: OsImage[];
|
|
15
18
|
isNutanix?: boolean;
|
|
16
19
|
};
|
|
17
20
|
|
|
@@ -20,6 +23,7 @@ const DetailsFormBody: React.FC<DetailsFormBodyProps> = ({
|
|
|
20
23
|
clusterImages,
|
|
21
24
|
extensionAfter,
|
|
22
25
|
isNutanix,
|
|
26
|
+
osImages,
|
|
23
27
|
}) => {
|
|
24
28
|
const { values } = useFormikContext<ClusterDetailsValues>();
|
|
25
29
|
const initRenderRef = React.useRef(true);
|
|
@@ -33,6 +37,7 @@ const DetailsFormBody: React.FC<DetailsFormBodyProps> = ({
|
|
|
33
37
|
clusterImages={clusterImages}
|
|
34
38
|
extensionAfter={extensionAfter}
|
|
35
39
|
isNutanix={isNutanix}
|
|
40
|
+
osImages={osImages}
|
|
36
41
|
/>
|
|
37
42
|
);
|
|
38
43
|
};
|
|
@@ -46,13 +51,17 @@ const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepP
|
|
|
46
51
|
clusterImages,
|
|
47
52
|
formRef,
|
|
48
53
|
usedClusterNames,
|
|
54
|
+
osImages,
|
|
55
|
+
isNutanix,
|
|
49
56
|
...rest
|
|
50
57
|
}) => {
|
|
58
|
+
const ocpVersions = getOCPVersions(clusterImages, !!isNutanix, osImages);
|
|
59
|
+
|
|
51
60
|
const [initialValues, validationSchema] = useDetailsFormik({
|
|
52
|
-
|
|
61
|
+
ocpVersions,
|
|
53
62
|
usedClusterNames,
|
|
54
|
-
isNutanix: !!rest.isNutanix,
|
|
55
63
|
});
|
|
64
|
+
|
|
56
65
|
return (
|
|
57
66
|
<Formik
|
|
58
67
|
initialValues={initialValues}
|
|
@@ -60,7 +69,12 @@ const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepP
|
|
|
60
69
|
innerRef={formRef}
|
|
61
70
|
onSubmit={noop}
|
|
62
71
|
>
|
|
63
|
-
<DetailsFormBody
|
|
72
|
+
<DetailsFormBody
|
|
73
|
+
clusterImages={clusterImages}
|
|
74
|
+
osImages={osImages}
|
|
75
|
+
isNutanix={isNutanix}
|
|
76
|
+
{...rest}
|
|
77
|
+
/>
|
|
64
78
|
</Formik>
|
|
65
79
|
);
|
|
66
80
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { Alert, Stack, StackItem } from '@patternfly/react-core';
|
|
3
|
-
import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource } from '../../types';
|
|
3
|
+
import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, OsImage } from '../../types';
|
|
4
4
|
import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
|
|
5
5
|
import { getOCPVersions, getSelectedVersion } from '../helpers';
|
|
6
6
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
@@ -8,6 +8,8 @@ import {
|
|
|
8
8
|
ClusterDetailsFormFields,
|
|
9
9
|
ClusterDetailsFormFieldsProps,
|
|
10
10
|
} from './ClusterDetailsFormFields';
|
|
11
|
+
import { useFormikContext } from 'formik';
|
|
12
|
+
import { ClusterDetailsValues, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
|
|
11
13
|
|
|
12
14
|
type ClusterDeploymentDetailsFormProps = {
|
|
13
15
|
clusterImages: ClusterImageSetK8sResource[];
|
|
@@ -15,6 +17,7 @@ type ClusterDeploymentDetailsFormProps = {
|
|
|
15
17
|
agentClusterInstall?: AgentClusterInstallK8sResource;
|
|
16
18
|
extensionAfter?: ClusterDetailsFormFieldsProps['extensionAfter'];
|
|
17
19
|
isNutanix?: boolean;
|
|
20
|
+
osImages?: OsImage[];
|
|
18
21
|
};
|
|
19
22
|
|
|
20
23
|
const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
|
|
@@ -23,16 +26,38 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
|
|
|
23
26
|
clusterImages,
|
|
24
27
|
extensionAfter,
|
|
25
28
|
isNutanix,
|
|
29
|
+
osImages,
|
|
26
30
|
}) => {
|
|
31
|
+
const { t } = useTranslation();
|
|
27
32
|
const ocpVersions = React.useMemo(
|
|
28
|
-
() => getOCPVersions(clusterImages, isNutanix),
|
|
29
|
-
[clusterImages, isNutanix],
|
|
33
|
+
() => getOCPVersions(clusterImages, isNutanix, osImages),
|
|
34
|
+
[clusterImages, isNutanix, osImages],
|
|
30
35
|
);
|
|
36
|
+
|
|
31
37
|
const forceOpenshiftVersion = agentClusterInstall
|
|
32
38
|
? getSelectedVersion(clusterImages, agentClusterInstall)
|
|
33
39
|
: undefined;
|
|
34
40
|
const isEditFlow = !!clusterDeployment;
|
|
35
|
-
|
|
41
|
+
|
|
42
|
+
const { values } = useFormikContext<ClusterDetailsValues>();
|
|
43
|
+
|
|
44
|
+
const cpuArchitectures = React.useMemo(() => {
|
|
45
|
+
const cpuArchitectures = [CpuArchitecture.x86, CpuArchitecture.ARM, CpuArchitecture.s390x];
|
|
46
|
+
if (!osImages) {
|
|
47
|
+
return cpuArchitectures;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const openshiftVersion = ocpVersions
|
|
51
|
+
.find((ver) => ver.value === values.openshiftVersion)
|
|
52
|
+
?.version.split('.')
|
|
53
|
+
.slice(0, 2)
|
|
54
|
+
.join('.');
|
|
55
|
+
|
|
56
|
+
return osImages
|
|
57
|
+
.filter((osImage) => osImage.openshiftVersion === openshiftVersion)
|
|
58
|
+
.map((osImage) => osImage.cpuArchitecture as SupportedCpuArchitecture);
|
|
59
|
+
}, [osImages, ocpVersions, values.openshiftVersion]);
|
|
60
|
+
|
|
36
61
|
return (
|
|
37
62
|
<Stack hasGutter>
|
|
38
63
|
{isEditFlow && (
|
|
@@ -51,6 +76,7 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
|
|
|
51
76
|
forceOpenshiftVersion={forceOpenshiftVersion}
|
|
52
77
|
extensionAfter={extensionAfter}
|
|
53
78
|
isNutanix={isNutanix}
|
|
79
|
+
cpuArchitectures={cpuArchitectures}
|
|
54
80
|
/>
|
|
55
81
|
</StackItem>
|
|
56
82
|
</Stack>
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
ClusterDetailsValues,
|
|
12
12
|
useFeatureSupportLevel,
|
|
13
13
|
getRichTextValidation,
|
|
14
|
+
OpenshiftVersionOptionType,
|
|
14
15
|
} from '../../../common';
|
|
15
16
|
|
|
16
17
|
import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from './types';
|
|
@@ -25,35 +26,33 @@ import {
|
|
|
25
26
|
InfraEnvK8sResource,
|
|
26
27
|
} from '../../types';
|
|
27
28
|
import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
|
|
28
|
-
import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
|
|
29
29
|
import { isCIMFlow, getGridSpans } from './helpers';
|
|
30
30
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
31
31
|
|
|
32
32
|
type UseDetailsFormikArgs = {
|
|
33
|
-
clusterImages: ClusterImageSetK8sResource[];
|
|
34
33
|
usedClusterNames: string[];
|
|
34
|
+
ocpVersions: OpenshiftVersionOptionType[];
|
|
35
35
|
clusterDeployment?: ClusterDeploymentK8sResource;
|
|
36
36
|
agentClusterInstall?: AgentClusterInstallK8sResource;
|
|
37
37
|
agents?: AgentK8sResource[];
|
|
38
38
|
infraEnv?: InfraEnvK8sResource;
|
|
39
|
-
isNutanix: boolean;
|
|
40
39
|
};
|
|
41
40
|
|
|
42
41
|
export const useDetailsFormik = ({
|
|
43
42
|
clusterDeployment,
|
|
44
43
|
agentClusterInstall,
|
|
45
44
|
agents,
|
|
46
|
-
clusterImages,
|
|
47
45
|
usedClusterNames,
|
|
48
46
|
infraEnv,
|
|
49
|
-
|
|
47
|
+
ocpVersions,
|
|
50
48
|
}: UseDetailsFormikArgs): [
|
|
51
49
|
ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
|
|
52
50
|
Lazy,
|
|
53
51
|
] => {
|
|
54
52
|
const { t } = useTranslation();
|
|
55
53
|
const featureSupportLevels = useFeatureSupportLevel();
|
|
56
|
-
const
|
|
54
|
+
const isEdit = !!clusterDeployment || !!agentClusterInstall;
|
|
55
|
+
|
|
57
56
|
const cluster = React.useMemo(
|
|
58
57
|
() =>
|
|
59
58
|
clusterDeployment && agentClusterInstall
|
|
@@ -66,6 +65,7 @@ export const useDetailsFormik = ({
|
|
|
66
65
|
: undefined,
|
|
67
66
|
[agentClusterInstall, clusterDeployment, agents, infraEnv],
|
|
68
67
|
);
|
|
68
|
+
|
|
69
69
|
const initialValues = React.useMemo(
|
|
70
70
|
() => {
|
|
71
71
|
const initValues = getClusterDetailsInitialValues({
|
|
@@ -85,7 +85,6 @@ export const useDetailsFormik = ({
|
|
|
85
85
|
[], // eslint-disable-line react-hooks/exhaustive-deps
|
|
86
86
|
);
|
|
87
87
|
|
|
88
|
-
const isEdit = !!clusterDeployment || !!agentClusterInstall;
|
|
89
88
|
const validationSchema = React.useMemo(
|
|
90
89
|
() =>
|
|
91
90
|
getClusterDetailsValidationSchema({
|
|
@@ -117,14 +116,15 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
|
|
|
117
116
|
const { addAlert } = useAlerts();
|
|
118
117
|
const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
|
|
119
118
|
const { t } = useTranslation();
|
|
119
|
+
const ocpVersions = getOCPVersions(clusterImages, isNutanix);
|
|
120
|
+
|
|
120
121
|
const [initialValues, validationSchema] = useDetailsFormik({
|
|
121
122
|
clusterDeployment,
|
|
123
|
+
ocpVersions,
|
|
122
124
|
agentClusterInstall,
|
|
123
125
|
agents,
|
|
124
|
-
clusterImages,
|
|
125
126
|
usedClusterNames,
|
|
126
127
|
infraEnv,
|
|
127
|
-
isNutanix,
|
|
128
128
|
});
|
|
129
129
|
const next = () =>
|
|
130
130
|
isCIMFlow(clusterDeployment)
|
|
@@ -13,16 +13,16 @@ import {
|
|
|
13
13
|
} from '../../../common/components/ui/formik';
|
|
14
14
|
import { ClusterDetailsValues } from '../../../common/components/clusterWizard/types';
|
|
15
15
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
16
|
-
import
|
|
16
|
+
import CpuArchitectureDropdown from '../common/CpuArchitectureDropdown';
|
|
17
17
|
import { SNOControlGroup } from '../../../common';
|
|
18
18
|
import { getNetworkType } from '../helpers';
|
|
19
|
-
|
|
20
19
|
export type ClusterDetailsFormFieldsProps = {
|
|
21
20
|
isEditFlow: boolean;
|
|
22
21
|
forceOpenshiftVersion?: string;
|
|
23
22
|
extensionAfter?: { [key: string]: React.ReactElement };
|
|
24
23
|
versions: OpenshiftVersionOptionType[];
|
|
25
24
|
isNutanix?: boolean;
|
|
25
|
+
cpuArchitectures?: string[];
|
|
26
26
|
};
|
|
27
27
|
|
|
28
28
|
export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
|
|
@@ -49,9 +49,11 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
|
|
|
49
49
|
forceOpenshiftVersion,
|
|
50
50
|
extensionAfter,
|
|
51
51
|
isNutanix,
|
|
52
|
+
cpuArchitectures,
|
|
52
53
|
}) => {
|
|
53
54
|
const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
|
|
54
55
|
const { name, baseDnsDomain, highAvailabilityMode } = values;
|
|
56
|
+
|
|
55
57
|
const nameInputRef = React.useRef<HTMLInputElement>();
|
|
56
58
|
React.useEffect(() => {
|
|
57
59
|
nameInputRef.current?.focus();
|
|
@@ -111,7 +113,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
|
|
|
111
113
|
{!isNutanix && (
|
|
112
114
|
<>
|
|
113
115
|
<SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
|
|
114
|
-
<
|
|
116
|
+
<CpuArchitectureDropdown isDisabled={isEditFlow} cpuArchitectures={cpuArchitectures} />
|
|
115
117
|
</>
|
|
116
118
|
)}
|
|
117
119
|
{extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
|
|
@@ -20,7 +20,12 @@ import { PencilAltIcon } from '@patternfly/react-icons/dist/js/icons/pencil-alt-
|
|
|
20
20
|
import { global_palette_green_500 as okColor } from '@patternfly/react-tokens/dist/js/global_palette_green_500';
|
|
21
21
|
import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
|
|
22
22
|
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
architectureData,
|
|
25
|
+
CpuArchitecture,
|
|
26
|
+
LabelValue,
|
|
27
|
+
SupportedCpuArchitecture,
|
|
28
|
+
} from '../../../common';
|
|
24
29
|
import { InfraEnvK8sResource, SecretK8sResource } from '../../types';
|
|
25
30
|
import { AGENT_LOCATION_LABEL_KEY } from '../common';
|
|
26
31
|
import EditPullSecretModal, { EditPullSecretModalProps } from '../modals/EditPullSecretModal';
|
|
@@ -160,9 +165,20 @@ const EnvironmentDetails: React.FC<EnvironmentDetailsProps> = ({
|
|
|
160
165
|
<DescriptionListGroup>
|
|
161
166
|
<DescriptionListTerm>{t('ai:CPU architecture')}</DescriptionListTerm>
|
|
162
167
|
<DescriptionListDescription>
|
|
163
|
-
{infraEnv.spec?.cpuArchitecture
|
|
168
|
+
{architectureData[infraEnv.spec?.cpuArchitecture as SupportedCpuArchitecture]
|
|
169
|
+
.label ?? CpuArchitecture.x86}
|
|
164
170
|
</DescriptionListDescription>
|
|
165
171
|
</DescriptionListGroup>
|
|
172
|
+
|
|
173
|
+
{infraEnv.spec?.osImageVersion && (
|
|
174
|
+
<DescriptionListGroup>
|
|
175
|
+
<DescriptionListTerm>{t('ai:OpenShift version')}</DescriptionListTerm>
|
|
176
|
+
<DescriptionListDescription>
|
|
177
|
+
{`OpenShift ${infraEnv.spec?.osImageVersion}`}
|
|
178
|
+
</DescriptionListDescription>
|
|
179
|
+
</DescriptionListGroup>
|
|
180
|
+
)}
|
|
181
|
+
|
|
166
182
|
<DescriptionListGroup>
|
|
167
183
|
<DescriptionListTerm>{t('ai:Labels')}</DescriptionListTerm>
|
|
168
184
|
<DescriptionListDescription>
|