@openshift-assisted/ui-lib 2.14.5-cim → 2.14.7-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/ClusterDeploymentDetailsForm.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ScaleUpForm.d.ts +1 -0
- package/build/@types/cim/components/ClusterDeployment/ScaleUpForm.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/EnvironmentDetails.d.ts.map +1 -1
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts +1 -0
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.js +2 -2
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js +2 -2
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js +16 -14
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js.map +1 -1
- package/build/cjs/cim/components/modals/ScaleUpModal.js +3 -3
- package/build/cjs/cim/components/modals/ScaleUpModal.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx +4 -2
- package/lib/cim/components/ClusterDeployment/ScaleUpForm.tsx +3 -0
- package/lib/cim/components/InfraEnv/EnvironmentDetails.tsx +7 -10
- package/lib/cim/components/modals/ScaleUpModal.tsx +5 -2
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentDetailsForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,EAEL,6BAA6B,EAC9B,MAAM,4BAA4B,CAAC;AAOpC,KAAK,iCAAiC,GAAG;IACvC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,iBAAiB,CAAC,EAAE,4BAA4B,CAAC;IACjD,mBAAmB,CAAC,EAAE,8BAA8B,CAAC;IACrD,cAAc,CAAC,EAAE,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mCAAmC;cAGpC,MAAM,SAAS;uBAgD1B,CAAC;AAEF,QAAA,MAAM,4BAA4B,EAAE,KAAK,CAAC,EAAE,CAAC,iCAAiC,
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentDetailsForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,EAEL,6BAA6B,EAC9B,MAAM,4BAA4B,CAAC;AAOpC,KAAK,iCAAiC,GAAG;IACvC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,iBAAiB,CAAC,EAAE,4BAA4B,CAAC;IACjD,mBAAmB,CAAC,EAAE,8BAA8B,CAAC;IACrD,cAAc,CAAC,EAAE,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mCAAmC;cAGpC,MAAM,SAAS;uBAgD1B,CAAC;AAEF,QAAA,MAAM,4BAA4B,EAAE,KAAK,CAAC,EAAE,CAAC,iCAAiC,CAiE7E,CAAC;AAEF,eAAe,4BAA4B,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { AgentTableActions } from '../ClusterDeployment/types';
|
|
|
4
4
|
type ScaleUpFormProps = {
|
|
5
5
|
agents: AgentK8sResource[];
|
|
6
6
|
onEditHost: AgentTableActions['onEditHost'];
|
|
7
|
+
onEditRole: AgentTableActions['onEditRole'];
|
|
7
8
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
8
9
|
isNutanix: boolean;
|
|
9
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/D,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ScaleUpForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/D,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA8D3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"EnvironmentDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAuB/B,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErE,OAA4B,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC9F,OAAwB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAA4B,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA8CtD,KAAK,uBAAuB,GAAG;IAC7B,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC7E,gBAAgB,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACvD,YAAY,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAC/C,gBAAgB,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACvD,WAAW,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAmMzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -14,6 +14,7 @@ type ScaleUpModalProps = {
|
|
|
14
14
|
onChangeBMHHostname: (bmh: BareMetalHostK8sResource, hostname: string) => Promise<unknown>;
|
|
15
15
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
16
16
|
isNutanix: boolean;
|
|
17
|
+
onEditHostRole: (agent: AgentK8sResource, role: string | undefined) => Promise<AgentK8sResource>;
|
|
17
18
|
};
|
|
18
19
|
declare const ScaleUpModal: React.FC<ScaleUpModalProps>;
|
|
19
20
|
export default ScaleUpModal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAMlF,OAAO,EAAE,iBAAiB,EAAqB,MAAM,4BAA4B,CAAC;AAMlF,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AA0BvD,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,iBAAiB,EAAE,CAAC,WAAW,EAAE,gBAAgB,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,cAAc,EAAE,wBAAwB,EAAE,CAAC;IAC3C,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3F,mBAAmB,EAAE,CAAC,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaleUpModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAMlF,OAAO,EAAE,iBAAiB,EAAqB,MAAM,4BAA4B,CAAC;AAMlF,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AA0BvD,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,iBAAiB,EAAE,CAAC,WAAW,EAAE,gBAAgB,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,cAAc,EAAE,wBAAwB,EAAE,CAAC;IAC3C,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3F,mBAAmB,EAAE,CAAC,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAClG,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAmI7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -46,14 +46,14 @@ const ClusterDeploymentDetailsForm = ({ agentClusterInstall, clusterDeployment,
|
|
|
46
46
|
const [cpuArchitectures, allowHighlyAvailable] = React.useMemo(() => {
|
|
47
47
|
var _a, _b, _c;
|
|
48
48
|
const cpuArchitectures = [common_1.CpuArchitecture.x86, common_1.CpuArchitecture.ARM, common_1.CpuArchitecture.s390x];
|
|
49
|
-
const version = allVersions.find((ver) => ver.value === values.openshiftVersion);
|
|
49
|
+
const version = allVersions.find((ver) => ver.value === values.openshiftVersion || ver.version === forceOpenshiftVersion);
|
|
50
50
|
const isMulti = ((_a = version === null || version === void 0 ? void 0 : version.cpuArchitectures) === null || _a === void 0 ? void 0 : _a[0]) === common_1.CpuArchitecture.MULTI;
|
|
51
51
|
const highlyAvailableSupported = (0, lodash_es_1.toNumber)((_c = (_b = version === null || version === void 0 ? void 0 : version.version) === null || _b === void 0 ? void 0 : _b.split('.')) === null || _c === void 0 ? void 0 : _c[1]) >= 18;
|
|
52
52
|
return [
|
|
53
53
|
(isMulti ? cpuArchitectures : version === null || version === void 0 ? void 0 : version.cpuArchitectures),
|
|
54
54
|
highlyAvailableSupported && !isMulti,
|
|
55
55
|
];
|
|
56
|
-
}, [allVersions, values.openshiftVersion]);
|
|
56
|
+
}, [allVersions, forceOpenshiftVersion, values.openshiftVersion]);
|
|
57
57
|
return (React.createElement(React.Fragment, null,
|
|
58
58
|
isEditFlow && (React.createElement(react_core_1.StackItem, null,
|
|
59
59
|
React.createElement(react_core_1.Alert, { isInline: true, variant: "info", title: t('ai:Some details are not editable after the draft cluster was created.') }))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentDetailsForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentDetailsForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const SwitchField_1 = tslib_1.__importDefault(require("../../../common/component
|
|
|
10
10
|
const ClusterScaleUpAutoHostsSelection_1 = tslib_1.__importDefault(require("./ClusterScaleUpAutoHostsSelection"));
|
|
11
11
|
const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
|
|
12
12
|
const RadioField_1 = tslib_1.__importDefault(require("../../../common/components/ui/formik/RadioField"));
|
|
13
|
-
const ScaleUpForm = ({ agents, onEditHost, onSetInstallationDiskId, isNutanix, }) => {
|
|
13
|
+
const ScaleUpForm = ({ agents, onEditHost, onEditRole, onSetInstallationDiskId, isNutanix, }) => {
|
|
14
14
|
const { values } = (0, formik_1.useFormikContext)();
|
|
15
15
|
const { autoSelectHosts } = values;
|
|
16
16
|
const availableAgents = react_1.default.useMemo(() => (0, agents_1.getAgentsForSelection)(agents).filter((agent) => {
|
|
@@ -32,7 +32,7 @@ const ScaleUpForm = ({ agents, onEditHost, onSetInstallationDiskId, isNutanix, }
|
|
|
32
32
|
t('ai:arm64'),
|
|
33
33
|
"\u00A0") }))))),
|
|
34
34
|
autoSelectHosts && react_1.default.createElement(ClusterScaleUpAutoHostsSelection_1.default, { availableAgents: availableAgents }),
|
|
35
|
-
!autoSelectHosts && (react_1.default.createElement(ClusterDeploymentHostsSelectionAdvanced_1.default, { availableAgents: availableAgents, onEditHost: onEditHost, onSetInstallationDiskId: onSetInstallationDiskId }))));
|
|
35
|
+
!autoSelectHosts && (react_1.default.createElement(ClusterDeploymentHostsSelectionAdvanced_1.default, { availableAgents: availableAgents, onEditHost: onEditHost, onEditRole: onEditRole, onSetInstallationDiskId: onSetInstallationDiskId }))));
|
|
36
36
|
};
|
|
37
37
|
exports.default = ScaleUpForm;
|
|
38
38
|
//# sourceMappingURL=ScaleUpForm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,uDAAyE;AACzE,8CAA0D;AAE1D,gIAAgG;AAEhG,2GAA2E;AAC3E,kHAAkF;AAElF,2FAA+E;AAC/E,yGAAyE;
|
|
1
|
+
{"version":3,"file":"ScaleUpForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,uDAAyE;AACzE,8CAA0D;AAE1D,gIAAgG;AAEhG,2GAA2E;AAC3E,kHAAkF;AAElF,2FAA+E;AAC/E,yGAAyE;AAUzE,MAAM,WAAW,GAA+B,CAAC,EAC/C,MAAM,EACN,UAAU,EACV,UAAU,EACV,uBAAuB,EACvB,SAAS,GACV,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAAqB,CAAC;IACzD,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,eAAe,GAAG,eAAK,CAAC,OAAO,CACnC,GAAG,EAAE,CACH,IAAA,8BAAqB,EAAC,MAAM,CAAC,CAAC,MAAM,CAClC,CAAC,KAAK,EAAE,EAAE;;QACR,OAAA,CAAC,CACC,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAI,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,CAAA,CACxF;YACD,CAAC,SAAS;gBACR,CAAC,CAAC,CAAA,MAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,0CAAE,YAAY,0CAAE,YAAY,MAAK,SAAS;gBACnE,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,CAAC,GAAG,0CAAE,YAAY,MAAK,MAAM,CAAC,eAAe,CAAC,CAAA;KAAA,CAC5E,EACH,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAC5C,CAAC;IACF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,OAAO,CACL,8BAAC,iBAAI;QACH,8BAAC,qBAAW,IAAC,IAAI,EAAC,iBAAiB,EAAC,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,GAAI;QACvE,CAAC,SAAS,IAAI,CACb,8BAAC,sBAAS,IAAC,OAAO,EAAC,iBAAiB,EAAC,KAAK,EAAE,CAAC,CAAC,qBAAqB,CAAC;YAClE,8BAAC,iBAAI,IAAC,cAAc,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAE;gBAC1D,8BAAC,qBAAQ;oBACP,8BAAC,oBAAU,IACT,IAAI,EAAC,iBAAiB,EACtB,EAAE,EAAC,QAAQ,EACX,KAAK,EAAC,QAAQ,EACd,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,GACrB,CACO;gBAEX,8BAAC,qBAAQ;oBACP,8BAAC,oBAAU,IACT,IAAI,EAAC,iBAAiB,EACtB,EAAE,EAAC,OAAO,EACV,KAAK,EAAC,OAAO,EACb,KAAK,EAAE;4BAAG,CAAC,CAAC,UAAU,CAAC;qCAAU,GACjC,CACO,CACN,CACG,CACb;QAEA,eAAe,IAAI,8BAAC,0CAAgC,IAAC,eAAe,EAAE,eAAe,GAAI;QAEzF,CAAC,eAAe,IAAI,CACnB,8BAAC,iDAAuC,IACtC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,uBAAuB,EAAE,uBAAuB,GAChD,CACH,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -39,7 +39,7 @@ const NotConfigured = () => {
|
|
|
39
39
|
React.createElement(react_core_1.Text, { component: react_core_1.TextVariants.small }, t('ai:Not configured'))));
|
|
40
40
|
};
|
|
41
41
|
const EnvironmentDetails = ({ infraEnv, fetchSecret, onEditPullSecret, onEditSSHKey, onEditNtpSources, hasAgents, hasBMHs, onEditProxy, }) => {
|
|
42
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
|
|
42
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
|
|
43
43
|
const [editPullSecret, setEditPullSecret] = React.useState(false);
|
|
44
44
|
const [editSSHKey, setEditSSHKey] = React.useState(false);
|
|
45
45
|
const [editNtpSources, setEditNtpSources] = React.useState(false);
|
|
@@ -74,6 +74,9 @@ const EnvironmentDetails = ({ infraEnv, fetchSecret, onEditPullSecret, onEditSSH
|
|
|
74
74
|
const hasProxy = ((_g = (_f = infraEnv.spec) === null || _f === void 0 ? void 0 : _f.proxy) === null || _g === void 0 ? void 0 : _g.httpProxy) ||
|
|
75
75
|
((_j = (_h = infraEnv.spec) === null || _h === void 0 ? void 0 : _h.proxy) === null || _j === void 0 ? void 0 : _j.httpsProxy) ||
|
|
76
76
|
((_l = (_k = infraEnv.spec) === null || _k === void 0 ? void 0 : _k.proxy) === null || _l === void 0 ? void 0 : _l.noProxy);
|
|
77
|
+
const arch = ((_m = infraEnv.spec) === null || _m === void 0 ? void 0 : _m.cpuArchitecture)
|
|
78
|
+
? (_p = common_1.architectureData[(_o = infraEnv.spec) === null || _o === void 0 ? void 0 : _o.cpuArchitecture]) === null || _p === void 0 ? void 0 : _p.label
|
|
79
|
+
: (_q = infraEnv.spec) === null || _q === void 0 ? void 0 : _q.cpuArchitecture;
|
|
77
80
|
return (React.createElement(React.Fragment, null,
|
|
78
81
|
React.createElement(react_core_1.Grid, { hasGutter: true },
|
|
79
82
|
React.createElement(react_core_1.GridItem, { span: 12 },
|
|
@@ -82,29 +85,28 @@ const EnvironmentDetails = ({ infraEnv, fetchSecret, onEditPullSecret, onEditSSH
|
|
|
82
85
|
React.createElement(react_core_1.DescriptionList, null,
|
|
83
86
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
84
87
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Name')),
|
|
85
|
-
React.createElement(react_core_1.DescriptionListDescription, null, (
|
|
88
|
+
React.createElement(react_core_1.DescriptionListDescription, null, (_r = infraEnv.metadata) === null || _r === void 0 ? void 0 : _r.name)),
|
|
86
89
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
87
90
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Location')),
|
|
88
|
-
React.createElement(react_core_1.DescriptionListDescription, null, (
|
|
91
|
+
React.createElement(react_core_1.DescriptionListDescription, null, (_u = (_t = (_s = infraEnv.metadata) === null || _s === void 0 ? void 0 : _s.labels) === null || _t === void 0 ? void 0 : _t[common_2.AGENT_LOCATION_LABEL_KEY]) !== null && _u !== void 0 ? _u : t('ai:No location'))),
|
|
89
92
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
90
93
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Network type')),
|
|
91
|
-
React.createElement(react_core_1.DescriptionListDescription, null, ((
|
|
94
|
+
React.createElement(react_core_1.DescriptionListDescription, null, ((_w = (_v = infraEnv.metadata) === null || _v === void 0 ? void 0 : _v.labels) === null || _w === void 0 ? void 0 : _w.networkType) === 'static'
|
|
92
95
|
? t('ai:Static IP, bridges and bonds')
|
|
93
96
|
: t('ai:DHCP only'))),
|
|
94
97
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
95
98
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:CPU architecture')),
|
|
96
|
-
React.createElement(react_core_1.DescriptionListDescription, null,
|
|
97
|
-
|
|
98
|
-
((_v = infraEnv.spec) === null || _v === void 0 ? void 0 : _v.osImageVersion) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
99
|
+
React.createElement(react_core_1.DescriptionListDescription, null, arch !== null && arch !== void 0 ? arch : '--')),
|
|
100
|
+
((_x = infraEnv.spec) === null || _x === void 0 ? void 0 : _x.osImageVersion) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
99
101
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:OpenShift version')),
|
|
100
|
-
React.createElement(react_core_1.DescriptionListDescription, null, `OpenShift ${(
|
|
102
|
+
React.createElement(react_core_1.DescriptionListDescription, null, `OpenShift ${(_y = infraEnv.spec) === null || _y === void 0 ? void 0 : _y.osImageVersion}`))),
|
|
101
103
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
102
104
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Labels')),
|
|
103
|
-
React.createElement(react_core_1.DescriptionListDescription, null, Object.keys(((
|
|
105
|
+
React.createElement(react_core_1.DescriptionListDescription, null, Object.keys(((_z = infraEnv.metadata) === null || _z === void 0 ? void 0 : _z.labels) || {}).map((k) => {
|
|
104
106
|
var _a, _b;
|
|
105
107
|
return (React.createElement(common_1.LabelValue, { key: k, value: `${k}=${((_b = (_a = infraEnv.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b[k]) || ''}` }));
|
|
106
108
|
}))),
|
|
107
|
-
((
|
|
109
|
+
((_0 = infraEnv.metadata) === null || _0 === void 0 ? void 0 : _0.creationTimestamp) && (React.createElement(react_core_1.DescriptionListGroup, null,
|
|
108
110
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Created at')),
|
|
109
111
|
React.createElement(react_core_1.DescriptionListDescription, null, new Date(infraEnv.metadata.creationTimestamp).toString()))))),
|
|
110
112
|
React.createElement(react_core_1.GridItem, { span: 6 },
|
|
@@ -114,17 +116,17 @@ const EnvironmentDetails = ({ infraEnv, fetchSecret, onEditPullSecret, onEditSSH
|
|
|
114
116
|
React.createElement(EditItem, { noIcon: true, title: t('ai:Proxy settings'), onEdit: () => setEditProxy(true) })),
|
|
115
117
|
!hasProxy ? (React.createElement(NotConfigured, null)) : (React.createElement(React.Fragment, null,
|
|
116
118
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:HTTP Proxy URL')),
|
|
117
|
-
React.createElement(react_core_1.DescriptionListDescription, null, ((
|
|
119
|
+
React.createElement(react_core_1.DescriptionListDescription, null, ((_2 = (_1 = infraEnv.spec) === null || _1 === void 0 ? void 0 : _1.proxy) === null || _2 === void 0 ? void 0 : _2.httpProxy) || React.createElement(NotConfigured, null)),
|
|
118
120
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:HTTPS Proxy URL')),
|
|
119
|
-
React.createElement(react_core_1.DescriptionListDescription, null, ((
|
|
121
|
+
React.createElement(react_core_1.DescriptionListDescription, null, ((_4 = (_3 = infraEnv.spec) === null || _3 === void 0 ? void 0 : _3.proxy) === null || _4 === void 0 ? void 0 : _4.httpsProxy) || React.createElement(NotConfigured, null)),
|
|
120
122
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:No proxy domains')),
|
|
121
|
-
React.createElement(react_core_1.DescriptionListDescription, null, ((
|
|
123
|
+
React.createElement(react_core_1.DescriptionListDescription, null, ((_7 = (_6 = (_5 = infraEnv.spec) === null || _5 === void 0 ? void 0 : _5.proxy) === null || _6 === void 0 ? void 0 : _6.noProxy) === null || _7 === void 0 ? void 0 : _7.split(',').map((k) => React.createElement(common_1.LabelValue, { key: k, value: `${k}` }))) || React.createElement(NotConfigured, null))))),
|
|
122
124
|
React.createElement(react_core_1.DescriptionListGroup, null,
|
|
123
125
|
React.createElement(react_core_1.DescriptionListTerm, null, t('ai:Secret and keys')),
|
|
124
126
|
React.createElement(react_core_1.DescriptionListDescription, null,
|
|
125
127
|
React.createElement(React.Fragment, null,
|
|
126
128
|
React.createElement(EditItem, { title: t('ai:Pull secret'), onEdit: () => setEditPullSecret(true), isLoading: pullSecretLoading, isWarning: !pullSecret }),
|
|
127
|
-
React.createElement(EditItem, { title: t('ai:SSH public key'), onEdit: () => setEditSSHKey(true), isWarning: !((
|
|
129
|
+
React.createElement(EditItem, { title: t('ai:SSH public key'), onEdit: () => setEditSSHKey(true), isWarning: !((_8 = infraEnv.spec) === null || _8 === void 0 ? void 0 : _8.sshAuthorizedKey) }),
|
|
128
130
|
React.createElement(EditItem, { title: t('ai:NTP sources'), onEdit: () => setEditNtpSources(true) }))))))),
|
|
129
131
|
React.createElement(EditPullSecretModal_1.default, { isOpen: editPullSecret, onClose: () => setEditPullSecret(false), pullSecret: pullSecret, pullSecretError: pullSecretError, pullSecretLoading: pullSecretLoading, onSubmit: onEditPullSecret, infraEnv: infraEnv, hasAgents: hasAgents, hasBMHs: hasBMHs }),
|
|
130
132
|
React.createElement(EditSSHKeyModal_1.default, { isOpen: editSSHKey, onClose: () => setEditSSHKey(false), infraEnv: infraEnv, onSubmit: onEditSSHKey, hasAgents: hasAgents, hasBMHs: hasBMHs }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentDetails.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentDetails.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAcgC;AAChC,+FAA0F;AAC1F,+GAA0G;AAC1G,2FAAsF;AACtF,wGAAgH;AAChH,wGAAqH;AAErH,
|
|
1
|
+
{"version":3,"file":"EnvironmentDetails.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ const getValidationSchema = (agentsCount) => {
|
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
32
|
};
|
|
33
|
-
const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, agents, bareMetalHosts, onChangeHostname, onChangeBMHHostname, onSetInstallationDiskId, isNutanix, }) => {
|
|
33
|
+
const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, agents, bareMetalHosts, onChangeHostname, onChangeBMHHostname, onSetInstallationDiskId, isNutanix, onEditHostRole, }) => {
|
|
34
34
|
const [editAgent, setEditAgent] = react_1.default.useState();
|
|
35
35
|
const [error, setError] = react_1.default.useState();
|
|
36
36
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
@@ -67,13 +67,13 @@ const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, a
|
|
|
67
67
|
((_c = a.spec.clusterDeploymentName) === null || _c === void 0 ? void 0 : _c.namespace) === ((_d = clusterDeployment.metadata) === null || _d === void 0 ? void 0 : _d.namespace);
|
|
68
68
|
});
|
|
69
69
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
70
|
-
react_1.default.createElement(react_core_1.Modal, { "aria-label": t('ai:Add
|
|
70
|
+
react_1.default.createElement(react_core_1.Modal, { "aria-label": t('ai:Add host dialog'), title: t('ai:Add hosts'), isOpen: isOpen, onClose: onClose, hasNoBodyWrapper: true, id: "scale-up-modal" },
|
|
71
71
|
react_1.default.createElement(formik_1.Formik, { initialValues: getInitialValues(), validationSchema: validationSchema, onSubmit: handleSubmit, validateOnMount: true }, ({ isSubmitting, isValid, submitForm }) => {
|
|
72
72
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
73
73
|
react_1.default.createElement(react_core_1.ModalBoxBody, null,
|
|
74
74
|
react_1.default.createElement(react_core_1.Stack, { hasGutter: true },
|
|
75
75
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
76
|
-
react_1.default.createElement(ScaleUpForm_1.default, { agents: agents, onEditHost: setEditAgent, onSetInstallationDiskId: onSetInstallationDiskId, isNutanix: isNutanix })),
|
|
76
|
+
react_1.default.createElement(ScaleUpForm_1.default, { agents: agents, onEditHost: setEditAgent, onEditRole: onEditHostRole, onSetInstallationDiskId: onSetInstallationDiskId, isNutanix: isNutanix })),
|
|
77
77
|
error && (react_1.default.createElement(react_core_1.StackItem, null,
|
|
78
78
|
react_1.default.createElement(react_core_1.Alert, { title: t('ai:Failed to add hosts to the cluster'), variant: react_core_1.AlertVariant.danger, actionClose: react_1.default.createElement(react_core_1.AlertActionCloseButton, { onClose: () => setError(undefined) }), isInline: true }, error))))),
|
|
79
79
|
react_1.default.createElement(react_core_1.ModalBoxFooter, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,uDAWgC;AAChC,mCAA2D;AAG3D,2FAA2D;AAC3D,oEAGsC;AAEtC,8EAA8C;AAC9C,0DAAmE;AACnE,iDAAwD;AACxD,2FAA+E;AAC/E,wCAAmD;AAGnD,MAAM,cAAc,GAAG,CACrB,eAAgG,EAChG,MAA0B,EAC1B,EAAE,CACF,MAAM,CAAC,MAAM,CACX,CAAC,KAAK,EAAE,EAAE;;IACR,OAAA,eAAe,CAAC,QAAQ,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAG,KAAI,EAAE,CAAC;QACnD,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAI,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,CAAA,CAAC,CAAA;CAAA,CAC7F,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CAAC,WAAmB,EAAE,EAAE;IAClD,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,MAAyB,EAAE,EAAE;QAC5C,OAAO,GAAG,CAAC,MAAM,EAAqB,CAAC,KAAK,CAAC;YAC3C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;YAC/C,mBAAmB,EAAE,MAAM,CAAC,eAAe;gBACzC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;gBACjD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAC3B,eAAe,EAAE,MAAM,CAAC,eAAe;gBACrC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;SACpD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaleUpModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,uDAWgC;AAChC,mCAA2D;AAG3D,2FAA2D;AAC3D,oEAGsC;AAEtC,8EAA8C;AAC9C,0DAAmE;AACnE,iDAAwD;AACxD,2FAA+E;AAC/E,wCAAmD;AAGnD,MAAM,cAAc,GAAG,CACrB,eAAgG,EAChG,MAA0B,EAC1B,EAAE,CACF,MAAM,CAAC,MAAM,CACX,CAAC,KAAK,EAAE,EAAE;;IACR,OAAA,eAAe,CAAC,QAAQ,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAG,KAAI,EAAE,CAAC;QACnD,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAI,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,CAAA,CAAC,CAAA;CAAA,CAC7F,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CAAC,WAAmB,EAAE,EAAE;IAClD,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,MAAyB,EAAE,EAAE;QAC5C,OAAO,GAAG,CAAC,MAAM,EAAqB,CAAC,KAAK,CAAC;YAC3C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;YAC/C,mBAAmB,EAAE,MAAM,CAAC,eAAe;gBACzC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;gBACjD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAC3B,eAAe,EAAE,MAAM,CAAC,eAAe;gBACrC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;SACpD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAgBF,MAAM,YAAY,GAAgC,CAAC,EACjD,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,SAAS,EACT,cAAc,GACf,EAAE,EAAE;IACH,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAgC,CAAC;IACjF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAsB,CAAC;IAE/D,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,gBAAgB,GAAG,GAAsB,EAAE;;QAC/C,MAAM,aAAa,GAAG,IAAA,yDAAqC,EACzD,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,WAAW,CACzC,CAAC;QAEF,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC;QACjD,OAAO;YACL,eAAe;YACf,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,aAAa,CAAC,MAAM;YACjC,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,eAAe,EAAE,IAAA,uDAAmC,EAAC,iBAAiB,CAAC;YACvE,eAAe,EAAE,EAAE;YACnB,mBAAmB,EAAE,EAAE;SACxB,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAElG,MAAM,YAAY,GAAgD,CAAO,MAAM,EAAE,EAAE;QACjF,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QACzE,IAAI;YACF,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,MAAM,WAAW,GAAG,cAAc,CAChC,eAAe,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,eAAe,EACvD,MAAM,CACP,CAAC;YACF,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACrC,OAAO,EAAE,CAAC;SACX;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE;;QACJ,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,qBAAqB,0CAAE,IAAI,OAAK,MAAA,iBAAiB,CAAC,QAAQ,0CAAE,IAAI,CAAA;YACvE,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,qBAAqB,0CAAE,SAAS,OAAK,MAAA,iBAAiB,CAAC,QAAQ,0CAAE,SAAS,CAAA,CAAA;KAAA,CACpF,CAAC;IACF,OAAO,CACL;QACE,8BAAC,kBAAK,kBACQ,CAAC,CAAC,oBAAoB,CAAC,EACnC,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,gBAAgB,QAChB,EAAE,EAAC,gBAAgB;YAEnB,8BAAC,eAAM,IACL,aAAa,EAAE,gBAAgB,EAAE,EACjC,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,YAAY,EACtB,eAAe,UAEd,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAkC,EAAE,EAAE;gBACzE,OAAO,CACL;oBACE,8BAAC,yBAAY;wBACX,8BAAC,kBAAK,IAAC,SAAS;4BACd,8BAAC,sBAAS;gCACR,8BAAC,qBAAW,IACV,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,YAAY,EACxB,UAAU,EAAE,cAAc,EAC1B,uBAAuB,EAAE,uBAAuB,EAChD,SAAS,EAAE,SAAS,GACpB,CACQ;4BACX,KAAK,IAAI,CACR,8BAAC,sBAAS;gCACR,8BAAC,kBAAK,IACJ,KAAK,EAAE,CAAC,CAAC,uCAAuC,CAAC,EACjD,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,WAAW,EACT,8BAAC,mCAAsB,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAI,EAEhE,QAAQ,UAEP,KAAK,CACA,CACE,CACb,CACK,CACK;oBACf,8BAAC,2BAAc;wBAEb,8BAAC,mBAAM,IAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,IAAI,CAAC,OAAO,IAC9D,CAAC,CAAC,WAAW,CAAC,CACR;wBACT,8BAAC,mBAAM,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,0BAAa,CAAC,SAAS,IACvD,CAAC,CAAC,WAAW,CAAC,CACR,CACM,CAChB,CACJ,CAAC;YACJ,CAAC,CACM,CACH;QACP,SAAS,IAAI,CACZ,8BAAC,wBAAc,IACb,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EACtC,MAAM,EAAE,IAAA,+BAAqB,EAC3B,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,mBAAmB,CACpB,EACD,aAAa,EAAE,IAAA,6BAAmB,EAAC,aAAa,CAAC,GACjD,CACH,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|
|
@@ -112,7 +112,9 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
|
|
|
112
112
|
|
|
113
113
|
const [cpuArchitectures, allowHighlyAvailable] = React.useMemo(() => {
|
|
114
114
|
const cpuArchitectures = [CpuArchitecture.x86, CpuArchitecture.ARM, CpuArchitecture.s390x];
|
|
115
|
-
const version = allVersions.find(
|
|
115
|
+
const version = allVersions.find(
|
|
116
|
+
(ver) => ver.value === values.openshiftVersion || ver.version === forceOpenshiftVersion,
|
|
117
|
+
);
|
|
116
118
|
const isMulti = version?.cpuArchitectures?.[0] === CpuArchitecture.MULTI;
|
|
117
119
|
|
|
118
120
|
const highlyAvailableSupported = toNumber(version?.version?.split('.')?.[1]) >= 18;
|
|
@@ -120,7 +122,7 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
|
|
|
120
122
|
(isMulti ? cpuArchitectures : version?.cpuArchitectures) as SupportedCpuArchitecture[],
|
|
121
123
|
highlyAvailableSupported && !isMulti,
|
|
122
124
|
];
|
|
123
|
-
}, [allVersions, values.openshiftVersion]);
|
|
125
|
+
}, [allVersions, forceOpenshiftVersion, values.openshiftVersion]);
|
|
124
126
|
|
|
125
127
|
return (
|
|
126
128
|
<>
|
|
@@ -14,6 +14,7 @@ import RadioField from '../../../common/components/ui/formik/RadioField';
|
|
|
14
14
|
type ScaleUpFormProps = {
|
|
15
15
|
agents: AgentK8sResource[];
|
|
16
16
|
onEditHost: AgentTableActions['onEditHost'];
|
|
17
|
+
onEditRole: AgentTableActions['onEditRole'];
|
|
17
18
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
18
19
|
isNutanix: boolean;
|
|
19
20
|
};
|
|
@@ -21,6 +22,7 @@ type ScaleUpFormProps = {
|
|
|
21
22
|
const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
|
|
22
23
|
agents,
|
|
23
24
|
onEditHost,
|
|
25
|
+
onEditRole,
|
|
24
26
|
onSetInstallationDiskId,
|
|
25
27
|
isNutanix,
|
|
26
28
|
}) => {
|
|
@@ -73,6 +75,7 @@ const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
|
|
|
73
75
|
<ClusterDeploymentHostsSelectionAdvanced<ScaleUpFormValues>
|
|
74
76
|
availableAgents={availableAgents}
|
|
75
77
|
onEditHost={onEditHost}
|
|
78
|
+
onEditRole={onEditRole}
|
|
76
79
|
onSetInstallationDiskId={onSetInstallationDiskId}
|
|
77
80
|
/>
|
|
78
81
|
)}
|
|
@@ -20,12 +20,7 @@ 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 {
|
|
24
|
-
architectureData,
|
|
25
|
-
CpuArchitecture,
|
|
26
|
-
LabelValue,
|
|
27
|
-
SupportedCpuArchitecture,
|
|
28
|
-
} from '../../../common';
|
|
23
|
+
import { architectureData, LabelValue } from '../../../common';
|
|
29
24
|
import { InfraEnvK8sResource, SecretK8sResource } from '../../types';
|
|
30
25
|
import { AGENT_LOCATION_LABEL_KEY } from '../common';
|
|
31
26
|
import EditPullSecretModal, { EditPullSecretModalProps } from '../modals/EditPullSecretModal';
|
|
@@ -134,6 +129,11 @@ const EnvironmentDetails: React.FC<EnvironmentDetailsProps> = ({
|
|
|
134
129
|
infraEnv.spec?.proxy?.httpProxy ||
|
|
135
130
|
infraEnv.spec?.proxy?.httpsProxy ||
|
|
136
131
|
infraEnv.spec?.proxy?.noProxy;
|
|
132
|
+
|
|
133
|
+
const arch = infraEnv.spec?.cpuArchitecture
|
|
134
|
+
? architectureData[infraEnv.spec?.cpuArchitecture]?.label
|
|
135
|
+
: infraEnv.spec?.cpuArchitecture;
|
|
136
|
+
|
|
137
137
|
return (
|
|
138
138
|
<>
|
|
139
139
|
<Grid hasGutter>
|
|
@@ -164,10 +164,7 @@ const EnvironmentDetails: React.FC<EnvironmentDetailsProps> = ({
|
|
|
164
164
|
</DescriptionListGroup>
|
|
165
165
|
<DescriptionListGroup>
|
|
166
166
|
<DescriptionListTerm>{t('ai:CPU architecture')}</DescriptionListTerm>
|
|
167
|
-
<DescriptionListDescription>
|
|
168
|
-
{architectureData[infraEnv.spec?.cpuArchitecture as SupportedCpuArchitecture]
|
|
169
|
-
.label ?? CpuArchitecture.x86}
|
|
170
|
-
</DescriptionListDescription>
|
|
167
|
+
<DescriptionListDescription>{arch ?? '--'}</DescriptionListDescription>
|
|
171
168
|
</DescriptionListGroup>
|
|
172
169
|
|
|
173
170
|
{infraEnv.spec?.osImageVersion && (
|
|
@@ -63,6 +63,7 @@ type ScaleUpModalProps = {
|
|
|
63
63
|
onChangeBMHHostname: (bmh: BareMetalHostK8sResource, hostname: string) => Promise<unknown>;
|
|
64
64
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
65
65
|
isNutanix: boolean;
|
|
66
|
+
onEditHostRole: (agent: AgentK8sResource, role: string | undefined) => Promise<AgentK8sResource>;
|
|
66
67
|
};
|
|
67
68
|
|
|
68
69
|
const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
@@ -76,6 +77,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
76
77
|
onChangeBMHHostname,
|
|
77
78
|
onSetInstallationDiskId,
|
|
78
79
|
isNutanix,
|
|
80
|
+
onEditHostRole,
|
|
79
81
|
}) => {
|
|
80
82
|
const [editAgent, setEditAgent] = React.useState<AgentK8sResource | undefined>();
|
|
81
83
|
const [error, setError] = React.useState<string | undefined>();
|
|
@@ -123,8 +125,8 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
123
125
|
return (
|
|
124
126
|
<>
|
|
125
127
|
<Modal
|
|
126
|
-
aria-label={t('ai:Add
|
|
127
|
-
title={t('ai:Add
|
|
128
|
+
aria-label={t('ai:Add host dialog')}
|
|
129
|
+
title={t('ai:Add hosts')}
|
|
128
130
|
isOpen={isOpen}
|
|
129
131
|
onClose={onClose}
|
|
130
132
|
hasNoBodyWrapper
|
|
@@ -145,6 +147,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
145
147
|
<ScaleUpForm
|
|
146
148
|
agents={agents}
|
|
147
149
|
onEditHost={setEditAgent}
|
|
150
|
+
onEditRole={onEditHostRole}
|
|
148
151
|
onSetInstallationDiskId={onSetInstallationDiskId}
|
|
149
152
|
isNutanix={isNutanix}
|
|
150
153
|
/>
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.14.
|
|
4
|
-
"@openshift-assisted/types": "2.14.
|
|
3
|
+
"@openshift-assisted/locales": "2.14.7-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.14.7-cim",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "5.2.0",
|
|
7
7
|
"@patternfly/react-code-editor": "5.2.0",
|
|
@@ -140,5 +140,5 @@
|
|
|
140
140
|
]
|
|
141
141
|
}
|
|
142
142
|
},
|
|
143
|
-
"version": "2.14.
|
|
143
|
+
"version": "2.14.7-cim"
|
|
144
144
|
}
|