@openshift-assisted/ui-lib 2.16.1-cim → 2.16.2-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/hostSelection/ClusterDeploymentHostSelectionStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/agentClusterInstall.d.ts +1 -0
- package/build/@types/cim/components/helpers/agentClusterInstall.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/ExternalPlatformsDropdown.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.js +4 -3
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.js +13 -4
- package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.js.map +1 -1
- package/build/cjs/cim/components/helpers/agentClusterInstall.js +7 -1
- package/build/cjs/cim/components/helpers/agentClusterInstall.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/ExternalPlatformsDropdown.js +7 -0
- package/build/cjs/common/components/clusterConfiguration/ExternalPlatformsDropdown.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx +3 -0
- package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx +23 -8
- package/lib/cim/components/helpers/agentClusterInstall.ts +4 -0
- package/lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx +9 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentHostSelectionStep.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAY3B,OAAO,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,4BAA4B,EAC7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,uCAAuC,EACvC,qCAAqC,EACtC,MAAM,UAAU,CAAC;AASlB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentHostSelectionStep.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAY3B,OAAO,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,4BAA4B,EAC7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,uCAAuC,EACvC,qCAAqC,EACtC,MAAM,UAAU,CAAC;AASlB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AA2EpC,KAAK,2BAA2B,GAAG;IACjC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,mBAAmB,EAAE,8BAA8B,CAAC;IACpD,CAAC,EAAE,SAAS,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,uBAAuB,2DAKjC,2BAA2B,KAAG;IAC/B,qCAAqC;IACrC,IAAI,IAAI,CAAC,IAAI,SAAS,CAAC;CAaxB,CAAC;AA8MF,eAAO,MAAM,kCAAkC,EAAE,KAAK,CAAC,EAAE,CACvD,uCAAuC,CAwCxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentHostsSelection.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EACL,oCAAoC,EAErC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentHostsSelection.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EACL,oCAAoC,EAErC,MAAM,UAAU,CAAC;AA2BlB,QAAA,MAAM,+BAA+B,EAAE,KAAK,CAAC,EAAE,CAAC,oCAAoC,CAkFnF,CAAC;AAEF,eAAe,+BAA+B,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AgentClusterInstallK8sResource, AgentK8sResource } from '../../types/k8s';
|
|
2
2
|
export declare const getIsSNOCluster: (agentClusterInstall?: AgentClusterInstallK8sResource) => boolean;
|
|
3
|
+
export declare const getIsTNACluster: (agentClusterInstall?: AgentClusterInstallK8sResource) => boolean;
|
|
3
4
|
export declare const getAgentClusterInstallOfAgent: (agentClusterInstalls: AgentClusterInstallK8sResource[], agent?: AgentK8sResource) => AgentClusterInstallK8sResource | undefined;
|
|
4
5
|
//# sourceMappingURL=agentClusterInstall.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentClusterInstall.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/agentClusterInstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnF,eAAO,MAAM,eAAe,yBAA0B,8BAA8B,YACR,CAAC;AAE7E,eAAO,MAAM,6BAA6B,yBAClB,8BAA8B,EAAE,UAC9C,gBAAgB,+CAiBzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"agentClusterInstall.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/agentClusterInstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnF,eAAO,MAAM,eAAe,yBAA0B,8BAA8B,YACR,CAAC;AAE7E,eAAO,MAAM,eAAe,yBAA0B,8BAA8B,YAEX,CAAC;AAE1E,eAAO,MAAM,6BAA6B,yBAClB,8BAA8B,EAAE,UAC9C,gBAAgB,+CAiBzB,CAAC"}
|
package/build/@types/common/components/clusterConfiguration/ExternalPlatformsDropdown.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalPlatformsDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"ExternalPlatformsDropdown.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,sDAAsD,CAAC;AAKpF,eAAO,MAAM,YAAY,MAAO,SAAS;;;;;;CAMvC,CAAC;AAEH,eAAO,MAAM,yBAAyB;gBAAkC,OAAO;uBAgE9E,CAAC"}
|
|
@@ -15,12 +15,13 @@ const use_translation_wrapper_1 = require("../../../../common/hooks/use-translat
|
|
|
15
15
|
const ValidationSection_1 = require("../components/ValidationSection");
|
|
16
16
|
const ClusterDeploymentWizardContext_1 = require("../ClusterDeploymentWizardContext");
|
|
17
17
|
const getInitialValues = ({ agents, clusterDeployment, agentClusterInstall, }) => {
|
|
18
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
18
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
19
19
|
const isSNOCluster = (0, helpers_1.getIsSNOCluster)(agentClusterInstall);
|
|
20
20
|
const cdName = (_a = clusterDeployment === null || clusterDeployment === void 0 ? void 0 : clusterDeployment.metadata) === null || _a === void 0 ? void 0 : _a.name;
|
|
21
21
|
const cdNamespace = (_b = clusterDeployment === null || clusterDeployment === void 0 ? void 0 : clusterDeployment.metadata) === null || _b === void 0 ? void 0 : _b.namespace;
|
|
22
22
|
let hostCount = (((_d = (_c = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _c === void 0 ? void 0 : _c.provisionRequirements) === null || _d === void 0 ? void 0 : _d.controlPlaneAgents) || 0) +
|
|
23
|
-
(((_f = (_e = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _e === void 0 ? void 0 : _e.provisionRequirements) === null || _f === void 0 ? void 0 : _f.
|
|
23
|
+
(((_f = (_e = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _e === void 0 ? void 0 : _e.provisionRequirements) === null || _f === void 0 ? void 0 : _f.arbiterAgents) || 0) +
|
|
24
|
+
(((_h = (_g = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _g === void 0 ? void 0 : _g.provisionRequirements) === null || _h === void 0 ? void 0 : _h.workerAgents) || 0);
|
|
24
25
|
if (isSNOCluster) {
|
|
25
26
|
hostCount = 1;
|
|
26
27
|
}
|
|
@@ -30,7 +31,7 @@ const getInitialValues = ({ agents, clusterDeployment, agentClusterInstall, }) =
|
|
|
30
31
|
else if (hostCount === 4) {
|
|
31
32
|
hostCount = 5;
|
|
32
33
|
}
|
|
33
|
-
const agentSelector = (0, helpers_1.getAgentSelectorFieldsFromAnnotations)((
|
|
34
|
+
const agentSelector = (0, helpers_1.getAgentSelectorFieldsFromAnnotations)((_j = clusterDeployment === null || clusterDeployment === void 0 ? void 0 : clusterDeployment.metadata) === null || _j === void 0 ? void 0 : _j.annotations);
|
|
34
35
|
const selectedIds = agents
|
|
35
36
|
.filter((agent) => {
|
|
36
37
|
var _a, _b, _c, _d;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentHostSelectionStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,mCAAgE;AAChE,uDAQgC;AAChC,+CAAgF;AAMhF,gHAAgF;AAKhF,4DAAiE;AACjE,2CAIuB;AACvB,0DAAmE;AACnE,8FAAkF;AAElF,uEAAoE;AACpE,sFAAmF;AAEnF,MAAM,gBAAgB,GAAG,CAAC,EACxB,MAAM,EACN,iBAAiB,EACjB,mBAAmB,GAKpB,EAAyC,EAAE;;IAC1C,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,mBAAmB,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,IAAI,CAAC;IACjD,MAAM,WAAW,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentHostSelectionStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,mCAAgE;AAChE,uDAQgC;AAChC,+CAAgF;AAMhF,gHAAgF;AAKhF,4DAAiE;AACjE,2CAIuB;AACvB,0DAAmE;AACnE,8FAAkF;AAElF,uEAAoE;AACpE,sFAAmF;AAEnF,MAAM,gBAAgB,GAAG,CAAC,EACxB,MAAM,EACN,iBAAiB,EACjB,mBAAmB,GAKpB,EAAyC,EAAE;;IAC1C,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,mBAAmB,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,IAAI,CAAC;IACjD,MAAM,WAAW,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,SAAS,CAAC;IAE3D,IAAI,SAAS,GACX,CAAC,CAAA,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,0CAAE,kBAAkB,KAAI,CAAC,CAAC;QAC3E,CAAC,CAAA,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,0CAAE,aAAa,KAAI,CAAC,CAAC;QACtE,CAAC,CAAA,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,0CAAE,YAAY,KAAI,CAAC,CAAC,CAAC;IAExE,IAAI,YAAY,EAAE;QAChB,SAAS,GAAG,CAAC,CAAC;KACf;SAAM,IAAI,SAAS,KAAK,CAAC,IAAI,SAAS,KAAK,CAAC,EAAE;QAC7C,SAAS,GAAG,CAAC,CAAC;KACf;SAAM,IAAI,SAAS,KAAK,CAAC,EAAE;QAC1B,SAAS,GAAG,CAAC,CAAC;KACf;IAED,MAAM,aAAa,GAAG,IAAA,+CAAqC,EACzD,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,QAAQ,0CAAE,WAAW,CACzC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM;SACvB,MAAM,CACL,CAAC,KAAK,EAAE,EAAE;;QACR,OAAA,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAK,MAAM;YAClD,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,MAAK,WAAW,CAAA;KAAA,CAC/D;SACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAa,CAAA,EAAA,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC;IAEjD,OAAO;QACL,eAAe;QACf,SAAS;QACT,mBAAmB,EAAE,SAAS,KAAK,CAAC,IAAI,SAAS,KAAK,CAAC;QACvD,WAAW,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,KAAI,EAAE;QACxC,SAAS,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,KAAI,EAAE;QACzC,eAAe,EAAE,WAAW;QAC5B,mBAAmB,EAAE,WAAW;KACjC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,mBAAmD,EAAE,CAAY,EAAE,EAAE;IAChG,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,mBAAmB,CAAC,CAAC;IAE1D,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,MAA6C,EAAE,EAAE;QAChE,OAAO,GAAG,CAAC,MAAM,CAAwC;YACvD,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,6CAAyB,EAAC,CAAC,CAAC;YACrE,mBAAmB,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;YACnE,mBAAmB,EAAE,MAAM,CAAC,eAAe;gBACzC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;gBACrE,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,YAAY;oBACd,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;yBACpB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,4CAA4C,CAAC,CAAC;yBACvD,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,4CAA4C,CAAC,CAAC,CAAC,4EAA4E;oBACzI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,oDAAoD,CAAC,CAAC;SAC5F,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AASK,MAAM,uBAAuB,GAAG,CAAC,EACtC,MAAM,EACN,iBAAiB,EACjB,mBAAmB,EACnB,CAAC,GAC2B,EAG5B,EAAE;IACF,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CACjC,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,CAAC,EAC1E,CAAC,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,CAAC,CACjD,CAAC;IAEF,MAAM,gBAAgB,GAAG,eAAK,CAAC,OAAO,CACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAC,CAAC,EACjD,CAAC,mBAAmB,EAAE,CAAC,CAAC,CACzB,CAAC;IAEF,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;AAC3C,CAAC,CAAC;AApBW,QAAA,uBAAuB,2BAoBlC;AAEF,MAAM,iBAAiB,GAAG,CACxB,MAA0B,EAC1B,MAA6C,EAC7C,EAAE;IACF,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe;QAC5C,CAAC,CAAC,MAAM,CAAC,mBAAmB;QAC5B,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,eAAe,CAAC,QAAQ,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAG,KAAI,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;AACvF,CAAC,CAAC;AAIF,MAAM,iBAAiB,GAAqC,CAAC,EAC3D,MAAM,EACN,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACX,UAAU,EAAE,cAAc,EAC1B,uBAAuB,EACvB,SAAS,GACV,EAAE,EAAE;IACH,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAA,6BAAgB,GAAE,CAAC;IAC7E,MAAM,EAAE,SAAS,EAAE,GAAG,eAAK,CAAC,UAAU,CAAC,+DAA8B,CAAC,CAAC;IACvE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC/B,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxE,MAAM,EACJ,MAAM,EACN,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,MAAM,EACN,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,GAAG,IAAA,yBAAgB,GAAyC,CAAC;IAC9D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzD,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,eAAK,CAAC,WAAW,CAClC,CAAO,KAAuB,EAAE,IAAwB,EAAE,EAAE;QAC1D,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAG,MAAM,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,KAAK,EAAE,IAAI,CAAC,CAAA,CAAC;QACrD,aAAa,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,EACD,CAAC,cAAc,EAAE,aAAa,CAAC,CAChC,CAAC;IAEF,MAAM,kBAAkB,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAChD,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC5B,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC1C,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC1C,IAAI,CAAC,cAAc,EAAE;YACnB,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;YACpC,UAAU,CACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACvC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;gBACjB,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAA6B,CAAC,CAClC,CAAC;YACF,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;gBAC9B,OAAO;aACR;SACF;QACD,KAAK,UAAU,EAAE,CAAC;QAClB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAA,EAAE,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3D,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,aAAa,IAAI,CAAC,YAAY,EAAE;YAClC,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CACtC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAC5E,CAAC;YACF,IACE,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5B,CAAC,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CACpF,EACD;gBACA,gBAAgB,CAAC,KAAK,CAAC,CAAC;aACzB;iBAAM,IACL,CAAC,CAAC,cAAc,CAAC,MAAM;gBACvB,cAAc,CAAC,KAAK,CAClB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,OAAO,CACxF,EACD;gBACA,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBAC3B,IAAI,IAAA,+CAA4B,EAAC,mBAAmB,EAAE,cAAc,CAAC,EAAE;oBACrE,KAAK,YAAY,EAAE,CAAC;iBACrB;aACF;SACF;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAExF,MAAM,cAAc,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACxC,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,CAAC,sBAAsB,CAAC,CAAC;SAClC;aAAM,IAAI,aAAa,IAAI,CAAC,iBAAiB,EAAE;YAC9C,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC;SACjC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;IAExD,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,SAAS,EAAE;YACb,gBAAgB,CAAC,KAAK,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,MAAM,aAAa,GAAG,CACpB,8BAAC,qCAAiB,IAAC,aAAa,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,IAC3D,SAAS,IAAI,CACZ,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,QAAQ,UAC5E,SAAS,CACJ,CACT,CACiB,CACrB,CAAC;IAEF,MAAM,MAAM,GAAG,eAAK,CAAC,OAAO,CAC1B,GAAG,EAAE,CAAC,CACJ,8BAAC,yBAAY,IACX,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,cAAc,EACZ,aAAa,IAAI,YAAY,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK;UAG5F,cAAc,EAAE,cAAc,IAAI,CAAC,CAAC,SAAS,CAAC,EAC9C,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,cAAc,EAAE,EAChD,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,KAAK,GACd,CACH,EACD;QACE,UAAU;QACV,MAAM;QACN,aAAa;QACb,YAAY;QACZ,cAAc;QACd,OAAO;QACP,YAAY;QACZ,cAAc;QACd,CAAC;QACD,YAAY;QACZ,KAAK;KACN,CACF,CAAC;IAEF,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;IAExB,OAAO,CACL,8BAAC,iBAAI,IAAC,SAAS;QACb,8BAAC,qBAAQ;YACP,8BAAC,gCAAuB,QAAE,CAAC,CAAC,kBAAkB,CAAC,CAA2B,CACjE;QACX,8BAAC,qBAAQ;YACP,8BAAC,yCAA+B,IAC9B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,uBAAuB,EAAE,uBAAuB,EAChD,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,GACpB,CACO;QACV,CAAC,iBAAiB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAC3D,8BAAC,qBAAQ;YACP,8BAAC,eAAM,OAAG,CACD,CACZ;QAEA,SAAS,IAAI,8BAAC,qBAAQ,QAAE,aAAa,CAAY;QACjD,cAAc,IAAI,MAAM,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,IAAI,CACtE,8BAAC,qBAAQ;YACP,8BAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,KAAK,EAAE,CAAC,CAAC,gDAAgD,CAAC,EAC1D,QAAQ,UAEP,MAAM,CAAC,eAAe,CACjB,CACC,CACZ,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kCAAkC,GAE3C,CAAC,EAAiC,EAAE,EAAE;QAArC,EAAE,oBAAoB,OAAW,EAAN,IAAI,sBAA/B,wBAAiC,CAAF;IAClC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IAEhE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,+BAAuB,EAAC;QAChE,MAAM;QACN,iBAAiB;QACjB,mBAAmB;QACnB,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAoE,CACpF,MAAM,EACN,EAAE,aAAa,EAAE,EACjB,EAAE;QACF,IAAI;YACF,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,CAAU,CAAC;YACzB,QAAQ,CAAC;gBACP,KAAK,EAAE,CAAC,CAAC,mCAAmC,CAAC;gBAC7C,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC;SACJ;gBAAS;YACR,aAAa,CAAC,KAAK,CAAC,CAAC;SACtB;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,CACL,8BAAC,eAAM,IACL,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,YAAY;QAEtB,8BAAC,iBAAiB,oBAAK,IAAI,EAAI,CACxB,CACV,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,kCAAkC,sCAyC7C"}
|
package/build/cjs/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.js
CHANGED
|
@@ -11,11 +11,22 @@ const helpers_1 = require("../../helpers");
|
|
|
11
11
|
const MinimalHWRequirements_1 = tslib_1.__importDefault(require("../../Agent/MinimalHWRequirements"));
|
|
12
12
|
const NoAgentsAlert_1 = tslib_1.__importDefault(require("../../Agent/NoAgentsAlert"));
|
|
13
13
|
const use_translation_wrapper_1 = require("../../../../common/hooks/use-translation-wrapper");
|
|
14
|
+
const getHostRequirementText = (isSNO, isTNA, t) => {
|
|
15
|
+
if (isSNO) {
|
|
16
|
+
return t('ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.');
|
|
17
|
+
}
|
|
18
|
+
else if (isTNA) {
|
|
19
|
+
return t('ai:Exactly 2 hosts capable of functioning as control plane nodes, and one arbiter, are required.');
|
|
20
|
+
}
|
|
21
|
+
return t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.');
|
|
22
|
+
};
|
|
14
23
|
const ClusterDeploymentHostsSelection = ({ agentClusterInstall, clusterDeployment, agents, aiConfigMap, onEditRole, onAutoSelectChange, onHostSelect, onSetInstallationDiskId, isNutanix, }) => {
|
|
15
24
|
var _a, _b;
|
|
25
|
+
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
16
26
|
const { values } = (0, formik_1.useFormikContext)();
|
|
17
27
|
const { autoSelectHosts } = values;
|
|
18
28
|
const isSNOCluster = (0, helpers_1.getIsSNOCluster)(agentClusterInstall);
|
|
29
|
+
const isTNA = (0, helpers_1.getIsTNACluster)(agentClusterInstall);
|
|
19
30
|
const cdName = (_a = clusterDeployment === null || clusterDeployment === void 0 ? void 0 : clusterDeployment.metadata) === null || _a === void 0 ? void 0 : _a.name;
|
|
20
31
|
const cdNamespace = (_b = clusterDeployment === null || clusterDeployment === void 0 ? void 0 : clusterDeployment.metadata) === null || _b === void 0 ? void 0 : _b.namespace;
|
|
21
32
|
const cpuArchitecture = (0, helpers_1.getClusterDeploymentCpuArchitecture)(clusterDeployment);
|
|
@@ -32,12 +43,10 @@ const ClusterDeploymentHostsSelection = ({ agentClusterInstall, clusterDeploymen
|
|
|
32
43
|
? filtered.filter((a) => { var _a, _b, _c; return ((_c = (_b = (_a = a.status) === null || _a === void 0 ? void 0 : _a.inventory) === null || _b === void 0 ? void 0 : _b.systemVendor) === null || _c === void 0 ? void 0 : _c.manufacturer) === 'Nutanix'; })
|
|
33
44
|
: filtered;
|
|
34
45
|
}, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
|
|
35
|
-
const
|
|
46
|
+
const hostRequirementText = getHostRequirementText(isSNOCluster, isTNA, t);
|
|
36
47
|
return (react_1.default.createElement(react_core_1.Grid, { hasGutter: true },
|
|
37
48
|
react_1.default.createElement(react_core_1.GridItem, null,
|
|
38
|
-
react_1.default.createElement(react_core_1.TextContent, null,
|
|
39
|
-
? t('ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.')
|
|
40
|
-
: t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.'))),
|
|
49
|
+
react_1.default.createElement(react_core_1.TextContent, null, hostRequirementText)),
|
|
41
50
|
aiConfigMap && (react_1.default.createElement(react_core_1.GridItem, null,
|
|
42
51
|
react_1.default.createElement(MinimalHWRequirements_1.default, { aiConfigMap: aiConfigMap, isSNOCluster: isSNOCluster }))),
|
|
43
52
|
react_1.default.createElement(react_core_1.GridItem, null, availableAgents.length ? (react_1.default.createElement(react_core_1.Form, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentHostsSelection.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,uDAA2E;AAC3E,+CAAiD;AAKjD,0HAA0F;AAC1F,uGAAoG;AACpG,
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentHostsSelection.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAgentClusterInstallOfAgent = exports.getIsSNOCluster = void 0;
|
|
3
|
+
exports.getAgentClusterInstallOfAgent = exports.getIsTNACluster = exports.getIsSNOCluster = void 0;
|
|
4
4
|
const agents_1 = require("./agents");
|
|
5
5
|
const getIsSNOCluster = (agentClusterInstall) => { var _a, _b; return ((_b = (_a = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.provisionRequirements) === null || _b === void 0 ? void 0 : _b.controlPlaneAgents) === 1; };
|
|
6
6
|
exports.getIsSNOCluster = getIsSNOCluster;
|
|
7
|
+
const getIsTNACluster = (agentClusterInstall) => {
|
|
8
|
+
var _a;
|
|
9
|
+
return ((_a = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.provisionRequirements.arbiterAgents) === 1 &&
|
|
10
|
+
agentClusterInstall.spec.provisionRequirements.controlPlaneAgents === 2;
|
|
11
|
+
};
|
|
12
|
+
exports.getIsTNACluster = getIsTNACluster;
|
|
7
13
|
const getAgentClusterInstallOfAgent = (agentClusterInstalls, agent) => {
|
|
8
14
|
if (!agent) {
|
|
9
15
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentClusterInstall.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/agentClusterInstall.ts"],"names":[],"mappings":";;;AACA,qCAAiD;AAE1C,MAAM,eAAe,GAAG,CAAC,mBAAoD,EAAE,EAAE,eACtF,OAAA,CAAA,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,0CAAE,kBAAkB,MAAK,CAAC,CAAA,EAAA,CAAC;AADhE,QAAA,eAAe,mBACiD;AAEtE,MAAM,6BAA6B,GAAG,CAC3C,oBAAsD,EACtD,KAAwB,EACxB,EAAE;IACF,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;;QACvC,MAAM,cAAc,GAAG,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,eAAe,0CAAE,IAAI,CACxD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,mBAAmB,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,CAC9D,CAAC;QACF,OAAO,CAAC,CAAC,cAAc,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAnBW,QAAA,6BAA6B,iCAmBxC"}
|
|
1
|
+
{"version":3,"file":"agentClusterInstall.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/agentClusterInstall.ts"],"names":[],"mappings":";;;AACA,qCAAiD;AAE1C,MAAM,eAAe,GAAG,CAAC,mBAAoD,EAAE,EAAE,eACtF,OAAA,CAAA,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,0CAAE,kBAAkB,MAAK,CAAC,CAAA,EAAA,CAAC;AADhE,QAAA,eAAe,mBACiD;AAEtE,MAAM,eAAe,GAAG,CAAC,mBAAoD,EAAE,EAAE;;IACtF,OAAA,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,qBAAqB,CAAC,aAAa,MAAK,CAAC;QACpE,mBAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,KAAK,CAAC,CAAA;CAAA,CAAC;AAF7D,QAAA,eAAe,mBAE8C;AAEnE,MAAM,6BAA6B,GAAG,CAC3C,oBAAsD,EACtD,KAAwB,EACxB,EAAE;IACF,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;;QACvC,MAAM,cAAc,GAAG,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,eAAe,0CAAE,IAAI,CACxD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,mBAAmB,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,CAC9D,CAAC;QACF,OAAO,CAAC,CAAC,cAAc,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAnBW,QAAA,6BAA6B,iCAmBxC"}
|
|
@@ -18,6 +18,7 @@ exports.getPlatforms = getPlatforms;
|
|
|
18
18
|
const ExternalPlatformsDropdown = ({ isDisabled }) => {
|
|
19
19
|
const [isOpen, setIsOpen] = React.useState(false);
|
|
20
20
|
const [{ value }, , { setValue }] = (0, formik_1.useField)('platform');
|
|
21
|
+
const { setFieldValue } = (0, formik_1.useFormikContext)();
|
|
21
22
|
const { t } = (0, hooks_1.useTranslation)();
|
|
22
23
|
const platforms = (0, exports.getPlatforms)(t);
|
|
23
24
|
const options = Object.entries(platforms)
|
|
@@ -26,6 +27,12 @@ const ExternalPlatformsDropdown = ({ isDisabled }) => {
|
|
|
26
27
|
const onSelect = (_event, value) => {
|
|
27
28
|
setValue(value);
|
|
28
29
|
setIsOpen(false);
|
|
30
|
+
if (value === 'external') {
|
|
31
|
+
setFieldValue('userManagedNetworking', true);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
setFieldValue('userManagedNetworking', false);
|
|
35
|
+
}
|
|
29
36
|
};
|
|
30
37
|
return isDisabled ? (React.createElement(ui_1.StaticField, { name: 'platform', label: t('ai:Integrate with external partner platforms'), isRequired: true }, platforms[value])) : (React.createElement(react_core_1.FormGroup, { isInline: true, label: t('ai:Integrate with external partner platforms'), isRequired: true, name: 'platform' },
|
|
31
38
|
React.createElement(react_core_1.Dropdown, { isOpen: isOpen, toggle: (toggleRef) => (React.createElement(react_core_1.MenuToggle, { ref: toggleRef, className: "pf-v5-u-w-100", onClick: () => setIsOpen(!isOpen) }, value ? platforms[value] : t('ai:Integrate with external partner platforms'))), onSelect: onSelect }, options)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalPlatformsDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,8BAAoC;AACpC,uCAA6C;AAG7C,uDAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"ExternalPlatformsDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,8BAAoC;AACpC,uCAA6C;AAG7C,uDAAuF;AACvF,mCAAoD;AAG7C,MAAM,YAAY,GAAG,CAAC,CAAY,EAAqC,EAAE,CAAC,CAAC;IAChF,IAAI,EAAE,CAAC,CAAC,4BAA4B,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,4BAA4B,CAAC;IAC1C,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC;IACxB,QAAQ,EAAE,CAAC,CAAC,4BAA4B,CAAC;CAC1C,CAAC,CAAC;AANU,QAAA,YAAY,gBAMtB;AAEI,MAAM,yBAAyB,GAAG,CAAC,EAAE,UAAU,EAA2B,EAAE,EAAE;IACnF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAe,UAAU,CAAC,CAAC;IACvE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAAwB,CAAC;IACnE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,sBAAc,GAAE,CAAC;IAE/B,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAC1B,oBAAC,yBAAY,IACX,GAAG,EAAE,QAAQ,EACb,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,QAAQ,KAAK,KAAK,EAC5B,OAAO,EAAE,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,IAEnD,KAAK,CACO,CAChB,CAAC,CAAC;IAEL,MAAM,QAAQ,GAAG,CACf,MAAyD,EACzD,KAAkC,EAClC,EAAE;QACF,QAAQ,CAAC,KAAqB,CAAC,CAAC;QAChC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEjB,IAAI,KAAK,KAAK,UAAU,EAAE;YACxB,aAAa,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;SAC9C;aAAM;YACL,aAAa,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,CAClB,oBAAC,gBAAW,IACV,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,CAAC,CAAC,8CAA8C,CAAC,EACxD,UAAU,UAET,SAAS,CAAC,KAAK,CAAC,CACL,CACf,CAAC,CAAC,CAAC,CACF,oBAAC,sBAAS,IACR,QAAQ,QACR,KAAK,EAAE,CAAC,CAAC,8CAA8C,CAAC,EACxD,UAAU,QACV,IAAI,EAAE,UAAU;QAEhB,oBAAC,qBAAQ,IACP,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CACrB,oBAAC,uBAAU,IAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAC,eAAe,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,IACpF,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,8CAA8C,CAAC,CAClE,CACd,EACD,QAAQ,EAAE,QAAQ,IAEjB,OAAO,CACC,CACD,CACb,CAAC;AACJ,CAAC,CAAC;AAhEW,QAAA,yBAAyB,6BAgEpC"}
|
package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx
CHANGED
|
@@ -45,9 +45,12 @@ const getInitialValues = ({
|
|
|
45
45
|
const isSNOCluster = getIsSNOCluster(agentClusterInstall);
|
|
46
46
|
const cdName = clusterDeployment?.metadata?.name;
|
|
47
47
|
const cdNamespace = clusterDeployment?.metadata?.namespace;
|
|
48
|
+
|
|
48
49
|
let hostCount =
|
|
49
50
|
(agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents || 0) +
|
|
51
|
+
(agentClusterInstall?.spec?.provisionRequirements?.arbiterAgents || 0) +
|
|
50
52
|
(agentClusterInstall?.spec?.provisionRequirements?.workerAgents || 0);
|
|
53
|
+
|
|
51
54
|
if (isSNOCluster) {
|
|
52
55
|
hostCount = 1;
|
|
53
56
|
} else if (hostCount === 2 || hostCount === 0) {
|
package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostsSelection.tsx
CHANGED
|
@@ -12,10 +12,25 @@ import {
|
|
|
12
12
|
getAgentsForSelection,
|
|
13
13
|
getClusterDeploymentCpuArchitecture,
|
|
14
14
|
getIsSNOCluster,
|
|
15
|
+
getIsTNACluster,
|
|
15
16
|
} from '../../helpers';
|
|
16
17
|
import MinimalHWRequirements from '../../Agent/MinimalHWRequirements';
|
|
17
18
|
import NoAgentsAlert from '../../Agent/NoAgentsAlert';
|
|
18
19
|
import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
|
|
20
|
+
import { TFunction } from 'i18next';
|
|
21
|
+
|
|
22
|
+
const getHostRequirementText = (isSNO: boolean, isTNA: boolean, t: TFunction) => {
|
|
23
|
+
if (isSNO) {
|
|
24
|
+
return t(
|
|
25
|
+
'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
|
|
26
|
+
);
|
|
27
|
+
} else if (isTNA) {
|
|
28
|
+
return t(
|
|
29
|
+
'ai:Exactly 2 hosts capable of functioning as control plane nodes, and one arbiter, are required.',
|
|
30
|
+
);
|
|
31
|
+
}
|
|
32
|
+
return t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.');
|
|
33
|
+
};
|
|
19
34
|
|
|
20
35
|
const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionProps> = ({
|
|
21
36
|
agentClusterInstall,
|
|
@@ -28,9 +43,11 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
|
|
|
28
43
|
onSetInstallationDiskId,
|
|
29
44
|
isNutanix,
|
|
30
45
|
}) => {
|
|
46
|
+
const { t } = useTranslation();
|
|
31
47
|
const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
|
|
32
48
|
const { autoSelectHosts } = values;
|
|
33
49
|
const isSNOCluster = getIsSNOCluster(agentClusterInstall);
|
|
50
|
+
const isTNA = getIsTNACluster(agentClusterInstall);
|
|
34
51
|
|
|
35
52
|
const cdName = clusterDeployment?.metadata?.name;
|
|
36
53
|
const cdNamespace = clusterDeployment?.metadata?.namespace;
|
|
@@ -45,22 +62,20 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
|
|
|
45
62
|
!agent.spec.clusterDeploymentName?.namespace &&
|
|
46
63
|
agent.status?.inventory.cpu?.architecture === cpuArchitecture),
|
|
47
64
|
);
|
|
65
|
+
|
|
48
66
|
return isNutanix
|
|
49
67
|
? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
|
|
50
68
|
: filtered;
|
|
51
69
|
}, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
|
|
52
|
-
|
|
70
|
+
|
|
71
|
+
const hostRequirementText = getHostRequirementText(isSNOCluster, isTNA, t);
|
|
72
|
+
|
|
53
73
|
return (
|
|
54
74
|
<Grid hasGutter>
|
|
55
75
|
<GridItem>
|
|
56
|
-
<TextContent>
|
|
57
|
-
{isSNOCluster
|
|
58
|
-
? t(
|
|
59
|
-
'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
|
|
60
|
-
)
|
|
61
|
-
: t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.')}
|
|
62
|
-
</TextContent>
|
|
76
|
+
<TextContent>{hostRequirementText}</TextContent>
|
|
63
77
|
</GridItem>
|
|
78
|
+
|
|
64
79
|
{aiConfigMap && (
|
|
65
80
|
<GridItem>
|
|
66
81
|
<MinimalHWRequirements aiConfigMap={aiConfigMap} isSNOCluster={isSNOCluster} />
|
|
@@ -4,6 +4,10 @@ import { getClusterNameOfAgent } from './agents';
|
|
|
4
4
|
export const getIsSNOCluster = (agentClusterInstall?: AgentClusterInstallK8sResource) =>
|
|
5
5
|
agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents === 1;
|
|
6
6
|
|
|
7
|
+
export const getIsTNACluster = (agentClusterInstall?: AgentClusterInstallK8sResource) =>
|
|
8
|
+
agentClusterInstall?.spec?.provisionRequirements.arbiterAgents === 1 &&
|
|
9
|
+
agentClusterInstall.spec.provisionRequirements.controlPlaneAgents === 2;
|
|
10
|
+
|
|
7
11
|
export const getAgentClusterInstallOfAgent = (
|
|
8
12
|
agentClusterInstalls: AgentClusterInstallK8sResource[],
|
|
9
13
|
agent?: AgentK8sResource,
|
|
@@ -4,7 +4,8 @@ import { useTranslation } from '../../hooks';
|
|
|
4
4
|
import { TFunction } from 'i18next';
|
|
5
5
|
import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
|
|
6
6
|
import { Dropdown, DropdownItem, FormGroup, MenuToggle } from '@patternfly/react-core';
|
|
7
|
-
import { useField } from 'formik';
|
|
7
|
+
import { useField, useFormikContext } from 'formik';
|
|
8
|
+
import { ClusterDetailsValues } from '../clusterWizard';
|
|
8
9
|
|
|
9
10
|
export const getPlatforms = (t: TFunction): { [key in PlatformType]: string } => ({
|
|
10
11
|
none: t('ai:No platform integration'),
|
|
@@ -17,6 +18,7 @@ export const getPlatforms = (t: TFunction): { [key in PlatformType]: string } =>
|
|
|
17
18
|
export const ExternalPlatformsDropdown = ({ isDisabled }: { isDisabled: boolean }) => {
|
|
18
19
|
const [isOpen, setIsOpen] = React.useState(false);
|
|
19
20
|
const [{ value }, , { setValue }] = useField<PlatformType>('platform');
|
|
21
|
+
const { setFieldValue } = useFormikContext<ClusterDetailsValues>();
|
|
20
22
|
const { t } = useTranslation();
|
|
21
23
|
|
|
22
24
|
const platforms = getPlatforms(t);
|
|
@@ -41,6 +43,12 @@ export const ExternalPlatformsDropdown = ({ isDisabled }: { isDisabled: boolean
|
|
|
41
43
|
) => {
|
|
42
44
|
setValue(value as PlatformType);
|
|
43
45
|
setIsOpen(false);
|
|
46
|
+
|
|
47
|
+
if (value === 'external') {
|
|
48
|
+
setFieldValue('userManagedNetworking', true);
|
|
49
|
+
} else {
|
|
50
|
+
setFieldValue('userManagedNetworking', false);
|
|
51
|
+
}
|
|
44
52
|
};
|
|
45
53
|
|
|
46
54
|
return isDisabled ? (
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.16.
|
|
4
|
-
"@openshift-assisted/types": "2.16.
|
|
3
|
+
"@openshift-assisted/locales": "2.16.2-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.16.2-cim",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "1.0.0",
|
|
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.16.
|
|
143
|
+
"version": "2.16.2-cim"
|
|
144
144
|
}
|