@openshift-assisted/ui-lib 2.9.12-cim → 2.9.13-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/ScaleUpForm.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/index.d.ts +0 -1
- package/build/@types/cim/components/InfraEnv/index.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +0 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/common/components/hosts/utils.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js +6 -6
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/index.js +0 -1
- package/build/cjs/cim/components/InfraEnv/index.js.map +1 -1
- package/build/cjs/common/components/hosts/utils.js +2 -1
- package/build/cjs/common/components/hosts/utils.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js +9 -3
- package/build/cjs/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/ScaleUpForm.tsx +30 -24
- package/lib/cim/components/InfraEnv/index.ts +0 -1
- package/lib/cim/types/k8s/agent-cluster-install.ts +0 -1
- package/lib/common/components/hosts/utils.ts +2 -1
- package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx +10 -5
- package/package.json +3 -3
- package/build/@types/cim/components/InfraEnv/utils.d.ts +0 -14
- package/build/@types/cim/components/InfraEnv/utils.d.ts.map +0 -1
- package/build/cjs/cim/components/InfraEnv/utils.js +0 -117
- package/build/cjs/cim/components/InfraEnv/utils.js.map +0 -1
- package/lib/cim/components/InfraEnv/utils.ts +0 -147
|
@@ -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,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA4D3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE/D,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE/D,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,sCAAsC,GAC9C,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,kCAAkC,GAC5C,eAAe,CAAC,sCAAsC,CAAC,CAAC;AAE1D,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,GAAG;IAC/D,IAAI,CAAC,EAAE;QACL,oBAAoB,CAAC,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,sCAAsC,GAC9C,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,kCAAkC,GAC5C,eAAe,CAAC,sCAAsC,CAAC,CAAC;AAE1D,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,GAAG;IAC/D,IAAI,CAAC,EAAE;QACL,oBAAoB,CAAC,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,eAAe,CAAC,EAAE;YAChB,wBAAwB,CAAC,EAAE;gBACzB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,sBAAsB,CAAC,EAAE;gBACvB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE;YACZ,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QACF,KAAK,CAAC,EAAE;YACN,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,qBAAqB,EAAE;YACrB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,UAAU,EAAE;YACV,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;gBACb,UAAU,EAAE,MAAM,CAAC;aACpB,EAAE,CAAC;YACJ,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;YAC1B,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;aACd,EAAE,CAAC;YACJ,qBAAqB,CAAC,EAAE,OAAO,CAAC;YAChC,WAAW,CAAC,EAAE,cAAc,GAAG,eAAe,CAAC;SAChD,CAAC;QACF,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,UAAU,CAAC,EAAE,kCAAkC,EAAE,CAAC;QAClD,QAAQ,CAAC,EAAE;YACT,eAAe,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACnC,CAAC;QACF,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,cAAc,CAAC,EAAE;YACf,IAAI,EAAE,MAAM,CAAC;SACd,EAAE,CAAC;KACL,CAAC;CACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/hosts/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACV,IAAI,EACJ,OAAO,EACP,SAAS,EACV,MAAM,sDAAsD,CAAC;AAI9D,OAAO,EACL,UAAU,EACV,eAAe,IAAI,mBAAmB,EAEvC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/hosts/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACV,IAAI,EACJ,OAAO,EACP,SAAS,EACV,MAAM,sDAAsD,CAAC;AAI9D,OAAO,EACL,UAAU,EACV,eAAe,IAAI,mBAAmB,EAEvC,MAAM,mBAAmB,CAAC;AAG3B,eAAO,MAAM,SAAS,kBAAmB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAE/B,CAAC;AAEpD,eAAO,MAAM,UAAU,kBAAmB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAY/D,CAAC;AAErB,eAAO,MAAM,SAAS,kBAAmB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAoB9D,CAAC;AAErB,eAAO,MAAM,QAAQ,kBAAmB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAEnB,CAAC;AAE/D,eAAO,MAAM,WAAW,kBAAmB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAchE,CAAC;AAErB,eAAO,MAAM,WAAW,kBACP,OAAO,CAAC,QAAQ,CAAC,UACxB,IAAI,CAAC,QAAQ,CAAC,UACd,OAAO,YACgC,CAAC;AAElD,eAAO,MAAM,eAAe,kBAAmB,OAAO,CAAC,QAAQ,CAAC,YACwB,CAAC;AAEzF,eAAO,MAAM,YAAY,kBAzBkB,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAyB7C,CAAC;AAExC,eAAO,MAAM,qBAAqB,kBAAmB,OAAO,CAAC,QAAQ,CAAC,YAGnE,CAAC;AAEJ,eAAO,MAAM,cAAc,YAAa,OAAO,cAAc,IAAI,CAAC,QAAQ,CAAC,YACwB,CAAC;AAEpG,eAAO,MAAM,aAAa,eACZ,IAAI,CAAC,QAAQ,CAAC,iBACX,OAAO,CAAC,QAAQ,CAAC,KAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,YAKnB,CAAC;AAEF,eAAO,MAAM,cAAc,kBAAmB,OAAO,CAAC,QAAQ,CAAC,YAE9D,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,IAAI,+EAA8B,CAAC;AAE/E,eAAO,MAAM,eAAe,SAAU,IAAI;;;;CAOnC,CAAC;AAER,eAAO,MAAM,0BAA0B,SAAU,IAAI,WAKpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,eAAgB,IAAI,CAAC,QAAQ,CAAC,YAWvC,CAAC;AAEzB,eAAO,MAAM,WAAW,SAChB,IAAI,KACP,SAAS,uBACS,OAAO,gBACd,OAAO,CAAC,MAAM,CAAC,KAC5B,MAYF,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,IAAI,YACgB,CAAC;AAE/D,eAAO,MAAM,sBAAsB,YAAa,OAAO,YAEY,CAAC;AAEpE,eAAO,MAAM,iBAAiB,YAAa,OAAO,WAAgC,CAAC;AACnF,eAAO,MAAM,mBAAmB,YAAa,OAAO,WAAkC,CAAC;AACvF,eAAO,MAAM,iBAAiB,YAAa,OAAO,WAAgC,CAAC;AAEnF,eAAO,MAAM,eAAe,WAAW,IAAI,EAAE,WACO,CAAC;AAErD,eAAO,MAAM,WAAW,SAAU,IAAI,aAAa,SAAS,WACR,CAAC;AAErD,eAAO,MAAM,mBAAmB,cAAe,SAAS,KAAK,SAAS,WAarE,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,IAAI,cAGtC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,IAAI,EAAE,kBAAkB,MAAM,GAAG,SAAS,WAmBjF,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBAAqB,mBAAmB,iBAOtD,CAAC;AAEzB,eAAO,MAAM,6BAA6B,oBAAqB,mBAAmB,YAWjF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CpuArchitectureDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"AAYA,OAAO,EAKL,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAC1B,OAAO,EACP,YAAY,EACb,MAAM,sDAAsD,CAAC;AAQ9D,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,wBAAwB,EAAE,mBAAmB,CAoBlF,CAAC;AAaF,KAAK,4BAA4B,GAAG;IAClC,gBAAgB,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9C,mBAAmB,CAAC,EAAE,wBAAwB,CAAC;IAC/C,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,QAAA,MAAM,uBAAuB,yFAM1B,4BAA4B,
|
|
1
|
+
{"version":3,"file":"CpuArchitectureDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"AAYA,OAAO,EAKL,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAC1B,OAAO,EACP,YAAY,EACb,MAAM,sDAAsD,CAAC;AAQ9D,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,wBAAwB,EAAE,mBAAmB,CAoBlF,CAAC;AAaF,KAAK,4BAA4B,GAAG;IAClC,gBAAgB,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9C,mBAAmB,CAAC,EAAE,wBAAwB,CAAC;IAC/C,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,QAAA,MAAM,uBAAuB,yFAM1B,4BAA4B,gBA6H9B,CAAC;AACF,eAAe,uBAAuB,CAAC"}
|
|
@@ -15,22 +15,22 @@ const ScaleUpForm = ({ agents, onEditHost, onSetInstallationDiskId, isNutanix, }
|
|
|
15
15
|
const { autoSelectHosts } = values;
|
|
16
16
|
const availableAgents = react_1.default.useMemo(() => (0, agents_1.getAgentsForSelection)(agents).filter((agent) => {
|
|
17
17
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
return !(((_b = (_a = agent.spec) === null || _a === void 0 ? void 0 : _a.clusterDeploymentName) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = agent.spec) === null || _c === void 0 ? void 0 : _c.clusterDeploymentName) === null || _d === void 0 ? void 0 : _d.namespace)) &&
|
|
19
|
+
(isNutanix
|
|
20
|
+
? ((_g = (_f = (_e = agent.status) === null || _e === void 0 ? void 0 : _e.inventory) === null || _f === void 0 ? void 0 : _f.systemVendor) === null || _g === void 0 ? void 0 : _g.manufacturer) === 'Nutanix'
|
|
21
|
+
: ((_j = (_h = agent.status) === null || _h === void 0 ? void 0 : _h.inventory.cpu) === null || _j === void 0 ? void 0 : _j.architecture) === values.cpuArchitecture);
|
|
22
22
|
}), [agents, values.cpuArchitecture, isNutanix]);
|
|
23
23
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
24
24
|
return (react_1.default.createElement(react_core_1.Form, null,
|
|
25
25
|
react_1.default.createElement(SwitchField_1.default, { name: "autoSelectHosts", label: t('ai:Auto-select hosts') }),
|
|
26
|
-
react_1.default.createElement(react_core_1.FormGroup, { fieldId: "cpuArchitecture", label: t('ai:CPU architecture') },
|
|
26
|
+
!isNutanix && (react_1.default.createElement(react_core_1.FormGroup, { fieldId: "cpuArchitecture", label: t('ai:CPU architecture') },
|
|
27
27
|
react_1.default.createElement(react_core_1.Flex, { justifyContent: { default: 'justifyContentFlexStart' } },
|
|
28
28
|
react_1.default.createElement(react_core_1.FlexItem, null,
|
|
29
29
|
react_1.default.createElement(RadioField_1.default, { name: "cpuArchitecture", id: "x86_64", value: "x86_64", label: t('ai:x86_64') })),
|
|
30
30
|
react_1.default.createElement(react_core_1.FlexItem, null,
|
|
31
31
|
react_1.default.createElement(RadioField_1.default, { name: "cpuArchitecture", id: "arm64", value: "arm64", label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
32
32
|
t('ai:arm64'),
|
|
33
|
-
"\u00A0") })))),
|
|
33
|
+
"\u00A0") }))))),
|
|
34
34
|
autoSelectHosts && react_1.default.createElement(ClusterScaleUpAutoHostsSelection_1.default, { availableAgents: availableAgents }),
|
|
35
35
|
!autoSelectHosts && (react_1.default.createElement(ClusterDeploymentHostsSelectionAdvanced_1.default, { availableAgents: availableAgents, onEditHost: onEditHost, onSetInstallationDiskId: onSetInstallationDiskId }))));
|
|
36
36
|
};
|
|
@@ -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;AASzE,MAAM,WAAW,GAA+B,CAAC,EAC/C,MAAM,EACN,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,
|
|
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;AASzE,MAAM,WAAW,GAA+B,CAAC,EAC/C,MAAM,EACN,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,uBAAuB,EAAE,uBAAuB,GAChD,CACH,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -14,5 +14,4 @@ var AddHostDropdown_1 = require("./AddHostDropdown");
|
|
|
14
14
|
Object.defineProperty(exports, "AddHostDropdown", { enumerable: true, get: function () { return tslib_1.__importDefault(AddHostDropdown_1).default; } });
|
|
15
15
|
tslib_1.__exportStar(require("./EnvironmentErrors"), exports);
|
|
16
16
|
tslib_1.__exportStar(require("./InfraEnvFormPage"), exports);
|
|
17
|
-
tslib_1.__exportStar(require("./utils"), exports);
|
|
18
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/index.ts"],"names":[],"mappings":";;;;AAAA,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AACtC,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AACtC,iFAA2F;AAAlF,uKAAA,OAAO,OAAiC;AACjD,6CAAuD;AAA9C,mIAAA,OAAO,OAAe;AAC/B,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AAEnC,8DAAoC;AACpC,6DAAmC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/index.ts"],"names":[],"mappings":";;;;AAAA,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AACtC,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AACtC,iFAA2F;AAAlF,uKAAA,OAAO,OAAiC;AACjD,6CAAuD;AAA9C,mIAAA,OAAO,OAAe;AAC/B,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AAEnC,8DAAoC;AACpC,6DAAmC"}
|
|
@@ -6,6 +6,7 @@ const fuse_js_1 = tslib_1.__importDefault(require("fuse.js"));
|
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const config_1 = require("../../config");
|
|
8
8
|
const constants_1 = require("../constants");
|
|
9
|
+
const api_1 = require("../../api");
|
|
9
10
|
const canEnable = (clusterStatus, status) => ['pending-for-input', 'insufficient', 'ready', 'adding-hosts'].includes(clusterStatus) &&
|
|
10
11
|
['disabled', 'disabled-unbound'].includes(status);
|
|
11
12
|
exports.canEnable = canEnable;
|
|
@@ -71,7 +72,7 @@ exports.canDownloadKubeconfig = canDownloadKubeconfig;
|
|
|
71
72
|
const canInstallHost = (cluster, hostStatus) => cluster.kind === 'AddHostsCluster' && cluster.status === 'adding-hosts' && hostStatus === 'known';
|
|
72
73
|
exports.canInstallHost = canInstallHost;
|
|
73
74
|
const getHostStatus = (hostStatus, clusterStatus) => {
|
|
74
|
-
if (hostStatus === 'installed' && clusterStatus !== 'installed') {
|
|
75
|
+
if (api_1.isInOcm && hostStatus === 'installed' && clusterStatus !== 'installed') {
|
|
75
76
|
return 'finalizing';
|
|
76
77
|
}
|
|
77
78
|
return hostStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/hosts/utils.ts"],"names":[],"mappings":";;;;AAAA,8DAA2B;AAO3B,uCAA2C;AAC3C,yCAAoD;AACpD,4CAAoC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/hosts/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,11 +48,16 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
48
48
|
if (cpuArchitectures !== undefined) {
|
|
49
49
|
return cpuArchitectures.map((cpuArch) => {
|
|
50
50
|
let isCpuSupported = true;
|
|
51
|
-
|
|
51
|
+
let disabledReason = `This cluster is using the ${platformType ? constants_1.ExternalPlatformLabels[platformType] : ''} platform which doesn't allow this CPU architecture.`;
|
|
52
|
+
if (day1CpuArchitecture === common_1.CpuArchitecture.ARM) {
|
|
53
|
+
isCpuSupported = cpuArch === common_1.CpuArchitecture.ARM;
|
|
54
|
+
disabledReason =
|
|
55
|
+
'Only hosts that have Arm64 CPU architecture can be added to this cluster.';
|
|
56
|
+
}
|
|
57
|
+
else if (supportLevelDataForAllCpuArchs) {
|
|
52
58
|
const featureSupportLevelData = supportLevelDataForAllCpuArchs[cpuArch];
|
|
53
59
|
isCpuSupported = newFeatureSupportLevelContext.isFeatureSupported(constants_1.ExternalPlaformIds[platformType ? platformType : 'baremetal'], featureSupportLevelData !== null && featureSupportLevelData !== void 0 ? featureSupportLevelData : undefined);
|
|
54
60
|
}
|
|
55
|
-
const disabledReason = `This cluster is using the ${platformType ? constants_1.ExternalPlatformLabels[platformType] : ''} platform which doesn't allow this CPU architecture.`;
|
|
56
61
|
return (react_1.default.createElement(react_core_1.DropdownItem, { key: cpuArch, id: cpuArch, description: cpuArch ? exports.architectureData[cpuArch].description : '', isAriaDisabled: !isCpuSupported },
|
|
57
62
|
react_1.default.createElement(react_core_1.Split, null,
|
|
58
63
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
@@ -63,9 +68,10 @@ const CpuArchitectureDropdown = ({ openshiftVersion, day1CpuArchitecture, cpuArc
|
|
|
63
68
|
}
|
|
64
69
|
}, [
|
|
65
70
|
cpuArchitectures,
|
|
71
|
+
day1CpuArchitecture,
|
|
66
72
|
supportLevelDataForAllCpuArchs,
|
|
67
|
-
newFeatureSupportLevelContext,
|
|
68
73
|
platformType,
|
|
74
|
+
newFeatureSupportLevelContext,
|
|
69
75
|
]);
|
|
70
76
|
const onSelect = react_1.default.useCallback((event) => {
|
|
71
77
|
const selectedCpuArch = event === null || event === void 0 ? void 0 : event.currentTarget.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAQgC;AAChC,yDAAwD;AACxD,mCAAkC;AAClC,4CAMyB;AAMzB,gGAG4D;AAC5D,kGAAkE;AAClE,+DAA6F;AAQhF,QAAA,gBAAgB,GAA0D;IACrF,CAAC,wBAAe,CAAC,GAAG,CAAC,EAAE;QACrB,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,QAAQ;KAChB;IACD,CAAC,wBAAe,CAAC,GAAG,CAAC,EAAE;QACrB,WAAW,EAAE,oCAAoC;QACjD,qBAAqB,EAAE,oBAAoB;QAC3C,KAAK,EAAE,OAAO;KACf;IACD,CAAC,wBAAe,CAAC,OAAO,CAAC,EAAE;QACzB,WAAW,EAAE,oCAAoC;QACjD,qBAAqB,EAAE,sBAAsB;QAC7C,KAAK,EAAE,qBAAqB;KAC7B;IACD,CAAC,wBAAe,CAAC,KAAK,CAAC,EAAE;QACvB,WAAW,EAAE,oCAAoC;QACjD,qBAAqB,EAAE,oBAAoB;QAC3C,KAAK,EAAE,eAAe;KACvB;CACF,CAAC;AAEF,MAAM,UAAU,GAAG,iBAAiB,CAAC;AACrC,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAM,0BAA0B,GAAG,CACjC,gBAA4C,EAC5C,eAAyC,EAChC,EAAE;IACX,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC;IACrF,OAAO,YAAY,KAAK,SAAS,CAAC;AACpC,CAAC,CAAC;AAUF,MAAM,uBAAuB,GAAG,CAAC,EAC/B,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EACR,YAAY,GACiB,EAAE,EAAE;IACjC,MAAM,6BAA6B,GAAG,IAAA,mDAAyB,GAAE,CAAC;IAElE,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,GAC7D,IAAA,iBAAQ,EAA2B,UAAU,CAAC,CAAC;IAEjD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,eAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACtD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,CACxD,mBAAmB,CAAC,CAAC,CAAC,wBAAgB,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,wBAAe,CAAC,GAAG,CACxF,CAAC;IAEF,MAAM,8BAA8B,GAAG,IAAA,6BAAmB,EACxD,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,CACjB,CAAC;IAEF,MAAM,YAAY,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtC,IAAI,cAAc,GAAG,IAAI,CAAC;gBAC1B,IAAI,8BAA8B,EAAE;
|
|
1
|
+
{"version":3,"file":"CpuArchitectureDropdown.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -28,38 +28,44 @@ const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
|
|
|
28
28
|
const { autoSelectHosts } = values;
|
|
29
29
|
const availableAgents = React.useMemo(
|
|
30
30
|
() =>
|
|
31
|
-
getAgentsForSelection(agents).filter(
|
|
32
|
-
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
return (
|
|
31
|
+
getAgentsForSelection(agents).filter(
|
|
32
|
+
(agent) =>
|
|
36
33
|
!(
|
|
37
34
|
agent.spec?.clusterDeploymentName?.name || agent.spec?.clusterDeploymentName?.namespace
|
|
38
|
-
) &&
|
|
39
|
-
|
|
40
|
-
|
|
35
|
+
) &&
|
|
36
|
+
(isNutanix
|
|
37
|
+
? agent.status?.inventory?.systemVendor?.manufacturer === 'Nutanix'
|
|
38
|
+
: agent.status?.inventory.cpu?.architecture === values.cpuArchitecture),
|
|
39
|
+
),
|
|
41
40
|
[agents, values.cpuArchitecture, isNutanix],
|
|
42
41
|
);
|
|
43
42
|
const { t } = useTranslation();
|
|
44
43
|
return (
|
|
45
44
|
<Form>
|
|
46
45
|
<SwitchField name="autoSelectHosts" label={t('ai:Auto-select hosts')} />
|
|
47
|
-
|
|
48
|
-
<
|
|
49
|
-
<
|
|
50
|
-
<
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
46
|
+
{!isNutanix && (
|
|
47
|
+
<FormGroup fieldId="cpuArchitecture" label={t('ai:CPU architecture')}>
|
|
48
|
+
<Flex justifyContent={{ default: 'justifyContentFlexStart' }}>
|
|
49
|
+
<FlexItem>
|
|
50
|
+
<RadioField
|
|
51
|
+
name="cpuArchitecture"
|
|
52
|
+
id="x86_64"
|
|
53
|
+
value="x86_64"
|
|
54
|
+
label={t('ai:x86_64')}
|
|
55
|
+
/>
|
|
56
|
+
</FlexItem>
|
|
57
|
+
{/* <FlexItem spacer={{ default: 'spacer4xl' }} /> */}
|
|
58
|
+
<FlexItem>
|
|
59
|
+
<RadioField
|
|
60
|
+
name="cpuArchitecture"
|
|
61
|
+
id="arm64"
|
|
62
|
+
value="arm64"
|
|
63
|
+
label={<>{t('ai:arm64')} </>}
|
|
64
|
+
/>
|
|
65
|
+
</FlexItem>
|
|
66
|
+
</Flex>
|
|
67
|
+
</FormGroup>
|
|
68
|
+
)}
|
|
63
69
|
|
|
64
70
|
{autoSelectHosts && <ClusterScaleUpAutoHostsSelection availableAgents={availableAgents} />}
|
|
65
71
|
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
ValidationsInfo as HostValidationsInfo,
|
|
14
14
|
ValidationGroup as HostValidationGroup,
|
|
15
15
|
} from '../../types/hosts';
|
|
16
|
+
import { isInOcm } from '../../api';
|
|
16
17
|
|
|
17
18
|
export const canEnable = (clusterStatus: Cluster['status'], status: Host['status']) =>
|
|
18
19
|
['pending-for-input', 'insufficient', 'ready', 'adding-hosts'].includes(clusterStatus) &&
|
|
@@ -97,7 +98,7 @@ export const getHostStatus = (
|
|
|
97
98
|
hostStatus: Host['status'],
|
|
98
99
|
clusterStatus: Cluster['status'],
|
|
99
100
|
): Host['status'] | 'finalizing' => {
|
|
100
|
-
if (hostStatus === 'installed' && clusterStatus !== 'installed') {
|
|
101
|
+
if (isInOcm && hostStatus === 'installed' && clusterStatus !== 'installed') {
|
|
101
102
|
return 'finalizing';
|
|
102
103
|
}
|
|
103
104
|
return hostStatus;
|
|
@@ -107,7 +107,14 @@ const CpuArchitectureDropdown = ({
|
|
|
107
107
|
if (cpuArchitectures !== undefined) {
|
|
108
108
|
return cpuArchitectures.map((cpuArch) => {
|
|
109
109
|
let isCpuSupported = true;
|
|
110
|
-
|
|
110
|
+
let disabledReason = `This cluster is using the ${
|
|
111
|
+
platformType ? ExternalPlatformLabels[platformType] : ''
|
|
112
|
+
} platform which doesn't allow this CPU architecture.`;
|
|
113
|
+
if (day1CpuArchitecture === CpuArchitecture.ARM) {
|
|
114
|
+
isCpuSupported = cpuArch === CpuArchitecture.ARM;
|
|
115
|
+
disabledReason =
|
|
116
|
+
'Only hosts that have Arm64 CPU architecture can be added to this cluster.';
|
|
117
|
+
} else if (supportLevelDataForAllCpuArchs) {
|
|
111
118
|
const featureSupportLevelData = supportLevelDataForAllCpuArchs[
|
|
112
119
|
cpuArch
|
|
113
120
|
] as NewFeatureSupportLevelMap;
|
|
@@ -117,9 +124,6 @@ const CpuArchitectureDropdown = ({
|
|
|
117
124
|
);
|
|
118
125
|
}
|
|
119
126
|
|
|
120
|
-
const disabledReason = `This cluster is using the ${
|
|
121
|
-
platformType ? ExternalPlatformLabels[platformType] : ''
|
|
122
|
-
} platform which doesn't allow this CPU architecture.`;
|
|
123
127
|
return (
|
|
124
128
|
<DropdownItem
|
|
125
129
|
key={cpuArch}
|
|
@@ -141,9 +145,10 @@ const CpuArchitectureDropdown = ({
|
|
|
141
145
|
}
|
|
142
146
|
}, [
|
|
143
147
|
cpuArchitectures,
|
|
148
|
+
day1CpuArchitecture,
|
|
144
149
|
supportLevelDataForAllCpuArchs,
|
|
145
|
-
newFeatureSupportLevelContext,
|
|
146
150
|
platformType,
|
|
151
|
+
newFeatureSupportLevelContext,
|
|
147
152
|
]);
|
|
148
153
|
|
|
149
154
|
const onSelect = React.useCallback(
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.9.
|
|
4
|
-
"@openshift-assisted/types": "2.9.
|
|
3
|
+
"@openshift-assisted/locales": "2.9.13-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.9.13-cim",
|
|
5
5
|
"@patternfly/patternfly": "^4.222.4",
|
|
6
6
|
"@patternfly/react-code-editor": "^4.82.113",
|
|
7
7
|
"@patternfly/react-core": "^4.168.8",
|
|
@@ -133,5 +133,5 @@
|
|
|
133
133
|
]
|
|
134
134
|
}
|
|
135
135
|
},
|
|
136
|
-
"version": "2.9.
|
|
136
|
+
"version": "2.9.13-cim"
|
|
137
137
|
}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, InfraEnvK8sResource, SecretK8sResource } from '../../types';
|
|
2
|
-
import { EnvironmentStepFormValues } from './InfraEnvFormPage';
|
|
3
|
-
export declare const getLabels: (values: EnvironmentStepFormValues) => Record<string, string>;
|
|
4
|
-
export declare const getClusterDeploymentForInfraEnv: (pullSecretName: string, namespace: string, values: EnvironmentStepFormValues) => ClusterDeploymentK8sResource;
|
|
5
|
-
type GetAgentClusterInstallProps = {
|
|
6
|
-
clusterDeploymentName?: string;
|
|
7
|
-
namespace: string;
|
|
8
|
-
values: EnvironmentStepFormValues;
|
|
9
|
-
};
|
|
10
|
-
export declare const getAgentClusterInstall: ({ clusterDeploymentName, namespace, values, }: GetAgentClusterInstallProps) => AgentClusterInstallK8sResource;
|
|
11
|
-
export declare const getSecret: (namespace: string, values: EnvironmentStepFormValues) => SecretK8sResource;
|
|
12
|
-
export declare const getInfraEnv: (namespace: string, values: EnvironmentStepFormValues) => InfraEnvK8sResource;
|
|
13
|
-
export {};
|
|
14
|
-
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAI/D,eAAO,MAAM,SAAS,WAAY,yBAAyB,2BAKzB,CAAC;AAGnC,eAAO,MAAM,+BAA+B,mBAC1B,MAAM,aACX,MAAM,UACT,yBAAyB,KAChC,4BAOC,CAAC;AAEL,KAAK,2BAA2B,GAAG;IACjC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,kDAIhC,2BAA2B,KAAG,8BA0ChC,CAAC;AAEF,eAAO,MAAM,SAAS,cACT,MAAM,UACT,yBAAyB,KAChC,iBAWD,CAAC;AAEH,eAAO,MAAM,WAAW,cACX,MAAM,UACT,yBAAyB,KAChC,mBA0CF,CAAC"}
|
|
@@ -1,117 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getInfraEnv = exports.getSecret = exports.getAgentClusterInstall = exports.getClusterDeploymentForInfraEnv = exports.getLabels = void 0;
|
|
4
|
-
const helpers_1 = require("../helpers");
|
|
5
|
-
const common_1 = require("../common");
|
|
6
|
-
const getLabels = (values) => values.labels.reduce((acc, curr) => {
|
|
7
|
-
const label = curr.split('=');
|
|
8
|
-
acc[label[0]] = label[1];
|
|
9
|
-
return acc;
|
|
10
|
-
}, {});
|
|
11
|
-
exports.getLabels = getLabels;
|
|
12
|
-
// TODO(mlibra): This should not be needed once we have late-binding
|
|
13
|
-
const getClusterDeploymentForInfraEnv = (pullSecretName, namespace, values) => (0, helpers_1.getClusterDeploymentResource)({
|
|
14
|
-
name: values.name,
|
|
15
|
-
namespace,
|
|
16
|
-
baseDnsDomain: '',
|
|
17
|
-
annotations: (0, exports.getLabels)(values),
|
|
18
|
-
pullSecretName,
|
|
19
|
-
});
|
|
20
|
-
exports.getClusterDeploymentForInfraEnv = getClusterDeploymentForInfraEnv;
|
|
21
|
-
const getAgentClusterInstall = ({ clusterDeploymentName, namespace, values, }) => {
|
|
22
|
-
const obj = {
|
|
23
|
-
apiVersion: 'extensions.hive.openshift.io/v1beta1',
|
|
24
|
-
kind: 'AgentClusterInstall',
|
|
25
|
-
metadata: {
|
|
26
|
-
name: values.name,
|
|
27
|
-
namespace,
|
|
28
|
-
},
|
|
29
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
30
|
-
// @ts-ignore
|
|
31
|
-
spec: {
|
|
32
|
-
holdInstallation: true,
|
|
33
|
-
networking: {
|
|
34
|
-
clusterNetwork: [
|
|
35
|
-
{
|
|
36
|
-
cidr: '10.128.0.0/14',
|
|
37
|
-
hostPrefix: 23, // 23,
|
|
38
|
-
},
|
|
39
|
-
],
|
|
40
|
-
serviceNetwork: ['172.30.0.0/16'],
|
|
41
|
-
},
|
|
42
|
-
provisionRequirements: {
|
|
43
|
-
controlPlaneAgents: 3,
|
|
44
|
-
},
|
|
45
|
-
imageSetRef: {
|
|
46
|
-
name: 'openshift-v4.8.0', // 'openshift-v4.7.0',
|
|
47
|
-
},
|
|
48
|
-
},
|
|
49
|
-
};
|
|
50
|
-
if (obj.spec && clusterDeploymentName) {
|
|
51
|
-
obj.spec.clusterDeploymentRef = {
|
|
52
|
-
name: clusterDeploymentName,
|
|
53
|
-
namespace,
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
if (obj.spec && values.sshPublicKey) {
|
|
57
|
-
obj.spec.sshPublicKey = values.sshPublicKey;
|
|
58
|
-
}
|
|
59
|
-
return obj;
|
|
60
|
-
};
|
|
61
|
-
exports.getAgentClusterInstall = getAgentClusterInstall;
|
|
62
|
-
const getSecret = (namespace, values) => ({
|
|
63
|
-
kind: 'Secret',
|
|
64
|
-
apiVersion: 'v1',
|
|
65
|
-
metadata: {
|
|
66
|
-
name: values.name,
|
|
67
|
-
namespace,
|
|
68
|
-
},
|
|
69
|
-
data: {
|
|
70
|
-
'.dockerconfigjson': btoa(values.pullSecret),
|
|
71
|
-
},
|
|
72
|
-
type: 'kubernetes.io/dockerconfigjson',
|
|
73
|
-
});
|
|
74
|
-
exports.getSecret = getSecret;
|
|
75
|
-
const getInfraEnv = (namespace, values) => {
|
|
76
|
-
const labels = (0, exports.getLabels)(values);
|
|
77
|
-
if (values.location) {
|
|
78
|
-
labels[common_1.AGENT_LOCATION_LABEL_KEY] = labels[common_1.AGENT_LOCATION_LABEL_KEY] || values.location;
|
|
79
|
-
}
|
|
80
|
-
const infraEnv = {
|
|
81
|
-
apiVersion: 'agent-install.openshift.io/v1beta1',
|
|
82
|
-
kind: 'InfraEnv',
|
|
83
|
-
metadata: {
|
|
84
|
-
name: values.name,
|
|
85
|
-
namespace,
|
|
86
|
-
labels: {
|
|
87
|
-
[common_1.AGENT_LOCATION_LABEL_KEY]: values.location,
|
|
88
|
-
},
|
|
89
|
-
},
|
|
90
|
-
spec: {
|
|
91
|
-
agentLabels: labels,
|
|
92
|
-
clusterRef: {
|
|
93
|
-
name: values.name,
|
|
94
|
-
namespace,
|
|
95
|
-
},
|
|
96
|
-
pullSecretRef: {
|
|
97
|
-
name: values.name,
|
|
98
|
-
},
|
|
99
|
-
sshAuthorizedKey: values.sshPublicKey,
|
|
100
|
-
},
|
|
101
|
-
status: {
|
|
102
|
-
agentLabelSelector: {
|
|
103
|
-
matchLabels: labels,
|
|
104
|
-
},
|
|
105
|
-
},
|
|
106
|
-
};
|
|
107
|
-
if (infraEnv.spec && values.enableProxy) {
|
|
108
|
-
infraEnv.spec.proxy = {
|
|
109
|
-
httpProxy: values.httpProxy,
|
|
110
|
-
httpsProxy: values.httpsProxy,
|
|
111
|
-
noProxy: values.noProxy,
|
|
112
|
-
};
|
|
113
|
-
}
|
|
114
|
-
return infraEnv;
|
|
115
|
-
};
|
|
116
|
-
exports.getInfraEnv = getInfraEnv;
|
|
117
|
-
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":";;;AAOA,wCAA0D;AAC1D,sCAAqD;AAE9C,MAAM,SAAS,GAAG,CAAC,MAAiC,EAAE,EAAE,CAC7D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAA4B,CAAC,CAAC;AALtB,QAAA,SAAS,aAKa;AAEnC,oEAAoE;AAC7D,MAAM,+BAA+B,GAAG,CAC7C,cAAsB,EACtB,SAAiB,EACjB,MAAiC,EACH,EAAE,CAChC,IAAA,sCAA4B,EAAC;IAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;IACjB,SAAS;IACT,aAAa,EAAE,EAAE;IACjB,WAAW,EAAE,IAAA,iBAAS,EAAC,MAAM,CAAC;IAC9B,cAAc;CACf,CAAC,CAAC;AAXQ,QAAA,+BAA+B,mCAWvC;AAQE,MAAM,sBAAsB,GAAG,CAAC,EACrC,qBAAqB,EACrB,SAAS,EACT,MAAM,GACsB,EAAkC,EAAE;IAChE,MAAM,GAAG,GAAmC;QAC1C,UAAU,EAAE,sCAAsC;QAClD,IAAI,EAAE,qBAAqB;QAC3B,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS;SACV;QACD,6DAA6D;QAC7D,aAAa;QACb,IAAI,EAAE;YACJ,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE;gBACV,cAAc,EAAE;oBACd;wBACE,IAAI,EAAE,eAAe;wBACrB,UAAU,EAAE,EAAE,EAAE,MAAM;qBACvB;iBACF;gBACD,cAAc,EAAE,CAAC,eAAe,CAAC;aAClC;YACD,qBAAqB,EAAE;gBACrB,kBAAkB,EAAE,CAAC;aACtB;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,kBAAkB,EAAE,sBAAsB;aACjD;SACF;KACF,CAAC;IAEF,IAAI,GAAG,CAAC,IAAI,IAAI,qBAAqB,EAAE;QACrC,GAAG,CAAC,IAAI,CAAC,oBAAoB,GAAG;YAC9B,IAAI,EAAE,qBAAqB;YAC3B,SAAS;SACV,CAAC;KACH;IAED,IAAI,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,YAAY,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;KAC7C;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA9CW,QAAA,sBAAsB,0BA8CjC;AAEK,MAAM,SAAS,GAAG,CACvB,SAAiB,EACjB,MAAiC,EACd,EAAE,CAAC,CAAC;IACvB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS;KACV;IACD,IAAI,EAAE;QACJ,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;KAC7C;IACD,IAAI,EAAE,gCAAgC;CACvC,CAAC,CAAC;AAdU,QAAA,SAAS,aAcnB;AAEI,MAAM,WAAW,GAAG,CACzB,SAAiB,EACjB,MAAiC,EACZ,EAAE;IACvB,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,MAAM,CAAC,CAAC;IACjC,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,MAAM,CAAC,iCAAwB,CAAC,GAAG,MAAM,CAAC,iCAAwB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC;KACxF;IAED,MAAM,QAAQ,GAAwB;QACpC,UAAU,EAAE,oCAAoC;QAChD,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS;YACT,MAAM,EAAE;gBACN,CAAC,iCAAwB,CAAC,EAAE,MAAM,CAAC,QAAQ;aAC5C;SACF;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;YACnB,UAAU,EAAE;gBACV,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,SAAS;aACV;YACD,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,IAAI;aAClB;YACD,gBAAgB,EAAE,MAAM,CAAC,YAAY;SACtC;QACD,MAAM,EAAE;YACN,kBAAkB,EAAE;gBAClB,WAAW,EAAE,MAAM;aACpB;SACF;KACF,CAAC;IAEF,IAAI,QAAQ,CAAC,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE;QACvC,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG;YACpB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;KACH;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA7CW,QAAA,WAAW,eA6CtB"}
|
|
@@ -1,147 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
AgentClusterInstallK8sResource,
|
|
3
|
-
ClusterDeploymentK8sResource,
|
|
4
|
-
InfraEnvK8sResource,
|
|
5
|
-
SecretK8sResource,
|
|
6
|
-
} from '../../types';
|
|
7
|
-
import { EnvironmentStepFormValues } from './InfraEnvFormPage';
|
|
8
|
-
import { getClusterDeploymentResource } from '../helpers';
|
|
9
|
-
import { AGENT_LOCATION_LABEL_KEY } from '../common';
|
|
10
|
-
|
|
11
|
-
export const getLabels = (values: EnvironmentStepFormValues) =>
|
|
12
|
-
values.labels.reduce((acc, curr) => {
|
|
13
|
-
const label = curr.split('=');
|
|
14
|
-
acc[label[0]] = label[1];
|
|
15
|
-
return acc;
|
|
16
|
-
}, {} as Record<string, string>);
|
|
17
|
-
|
|
18
|
-
// TODO(mlibra): This should not be needed once we have late-binding
|
|
19
|
-
export const getClusterDeploymentForInfraEnv = (
|
|
20
|
-
pullSecretName: string,
|
|
21
|
-
namespace: string,
|
|
22
|
-
values: EnvironmentStepFormValues,
|
|
23
|
-
): ClusterDeploymentK8sResource =>
|
|
24
|
-
getClusterDeploymentResource({
|
|
25
|
-
name: values.name,
|
|
26
|
-
namespace,
|
|
27
|
-
baseDnsDomain: '', // TODO(mlibra): This function is about to be removed anyway
|
|
28
|
-
annotations: getLabels(values),
|
|
29
|
-
pullSecretName,
|
|
30
|
-
});
|
|
31
|
-
|
|
32
|
-
type GetAgentClusterInstallProps = {
|
|
33
|
-
clusterDeploymentName?: string;
|
|
34
|
-
namespace: string;
|
|
35
|
-
values: EnvironmentStepFormValues;
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
export const getAgentClusterInstall = ({
|
|
39
|
-
clusterDeploymentName,
|
|
40
|
-
namespace,
|
|
41
|
-
values,
|
|
42
|
-
}: GetAgentClusterInstallProps): AgentClusterInstallK8sResource => {
|
|
43
|
-
const obj: AgentClusterInstallK8sResource = {
|
|
44
|
-
apiVersion: 'extensions.hive.openshift.io/v1beta1',
|
|
45
|
-
kind: 'AgentClusterInstall',
|
|
46
|
-
metadata: {
|
|
47
|
-
name: values.name,
|
|
48
|
-
namespace,
|
|
49
|
-
},
|
|
50
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
51
|
-
// @ts-ignore
|
|
52
|
-
spec: {
|
|
53
|
-
holdInstallation: true,
|
|
54
|
-
networking: {
|
|
55
|
-
clusterNetwork: [
|
|
56
|
-
{
|
|
57
|
-
cidr: '10.128.0.0/14', // '10.128.0.0/14',
|
|
58
|
-
hostPrefix: 23, // 23,
|
|
59
|
-
},
|
|
60
|
-
],
|
|
61
|
-
serviceNetwork: ['172.30.0.0/16'],
|
|
62
|
-
},
|
|
63
|
-
provisionRequirements: {
|
|
64
|
-
controlPlaneAgents: 3,
|
|
65
|
-
},
|
|
66
|
-
imageSetRef: {
|
|
67
|
-
name: 'openshift-v4.8.0', // 'openshift-v4.7.0',
|
|
68
|
-
},
|
|
69
|
-
},
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
if (obj.spec && clusterDeploymentName) {
|
|
73
|
-
obj.spec.clusterDeploymentRef = {
|
|
74
|
-
name: clusterDeploymentName,
|
|
75
|
-
namespace,
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
if (obj.spec && values.sshPublicKey) {
|
|
80
|
-
obj.spec.sshPublicKey = values.sshPublicKey;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
return obj;
|
|
84
|
-
};
|
|
85
|
-
|
|
86
|
-
export const getSecret = (
|
|
87
|
-
namespace: string,
|
|
88
|
-
values: EnvironmentStepFormValues,
|
|
89
|
-
): SecretK8sResource => ({
|
|
90
|
-
kind: 'Secret',
|
|
91
|
-
apiVersion: 'v1',
|
|
92
|
-
metadata: {
|
|
93
|
-
name: values.name,
|
|
94
|
-
namespace,
|
|
95
|
-
},
|
|
96
|
-
data: {
|
|
97
|
-
'.dockerconfigjson': btoa(values.pullSecret),
|
|
98
|
-
},
|
|
99
|
-
type: 'kubernetes.io/dockerconfigjson',
|
|
100
|
-
});
|
|
101
|
-
|
|
102
|
-
export const getInfraEnv = (
|
|
103
|
-
namespace: string,
|
|
104
|
-
values: EnvironmentStepFormValues,
|
|
105
|
-
): InfraEnvK8sResource => {
|
|
106
|
-
const labels = getLabels(values);
|
|
107
|
-
if (values.location) {
|
|
108
|
-
labels[AGENT_LOCATION_LABEL_KEY] = labels[AGENT_LOCATION_LABEL_KEY] || values.location;
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
const infraEnv: InfraEnvK8sResource = {
|
|
112
|
-
apiVersion: 'agent-install.openshift.io/v1beta1',
|
|
113
|
-
kind: 'InfraEnv',
|
|
114
|
-
metadata: {
|
|
115
|
-
name: values.name,
|
|
116
|
-
namespace,
|
|
117
|
-
labels: {
|
|
118
|
-
[AGENT_LOCATION_LABEL_KEY]: values.location,
|
|
119
|
-
},
|
|
120
|
-
},
|
|
121
|
-
spec: {
|
|
122
|
-
agentLabels: labels,
|
|
123
|
-
clusterRef: {
|
|
124
|
-
name: values.name,
|
|
125
|
-
namespace,
|
|
126
|
-
},
|
|
127
|
-
pullSecretRef: {
|
|
128
|
-
name: values.name,
|
|
129
|
-
},
|
|
130
|
-
sshAuthorizedKey: values.sshPublicKey,
|
|
131
|
-
},
|
|
132
|
-
status: {
|
|
133
|
-
agentLabelSelector: {
|
|
134
|
-
matchLabels: labels,
|
|
135
|
-
},
|
|
136
|
-
},
|
|
137
|
-
};
|
|
138
|
-
|
|
139
|
-
if (infraEnv.spec && values.enableProxy) {
|
|
140
|
-
infraEnv.spec.proxy = {
|
|
141
|
-
httpProxy: values.httpProxy,
|
|
142
|
-
httpsProxy: values.httpsProxy,
|
|
143
|
-
noProxy: values.noProxy,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
return infraEnv;
|
|
147
|
-
};
|