@openshift-assisted/ui-lib 2.48.0 → 2.48.2
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/common/api/assisted-service/BundleAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/BundleAPI.d.ts.map +1 -1
- package/build/@types/ocm/components/HostsClusterDetailTab/utils.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/operators/bundleSpecs.d.ts +0 -1
- package/build/@types/ocm/components/clusterConfiguration/operators/bundleSpecs.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/ReviewSummary.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetails.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/OperatorsBundle.d.ts +2 -1
- package/build/@types/ocm/components/clusterWizard/OperatorsBundle.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/OperatorsStep.d.ts.map +1 -1
- package/build/@types/ocm/services/BundleService.d.ts +1 -1
- package/build/@types/ocm/services/BundleService.d.ts.map +1 -1
- package/build/cjs/common/api/assisted-service/BundleAPI.js +4 -2
- package/build/cjs/common/api/assisted-service/BundleAPI.js.map +1 -1
- package/build/cjs/ocm/components/HostsClusterDetailTab/utils.js +18 -11
- package/build/cjs/ocm/components/HostsClusterDetailTab/utils.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/operators/bundleSpecs.js +0 -2
- package/build/cjs/ocm/components/clusterConfiguration/operators/bundleSpecs.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewCluster.css +2 -4
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js +2 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/TableSummaryExpandable.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/TableSummaryExpandable.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js +2 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js +11 -16
- package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/OperatorsStep.js +14 -3
- package/build/cjs/ocm/components/clusterWizard/OperatorsStep.js.map +1 -1
- package/build/cjs/ocm/services/BundleService.js +2 -2
- package/build/cjs/ocm/services/BundleService.js.map +1 -1
- package/lib/common/api/assisted-service/BundleAPI.ts +15 -2
- package/lib/ocm/components/HostsClusterDetailTab/utils.ts +30 -14
- package/lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx +0 -3
- package/lib/ocm/components/clusterConfiguration/review/ReviewCluster.css +2 -4
- package/lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx +8 -2
- package/lib/ocm/components/clusterConfiguration/review/TableSummaryExpandable.tsx +2 -2
- package/lib/ocm/components/clusterWizard/ClusterDetails.tsx +7 -3
- package/lib/ocm/components/clusterWizard/OperatorsBundle.tsx +8 -11
- package/lib/ocm/components/clusterWizard/OperatorsStep.tsx +22 -2
- package/lib/ocm/services/BundleService.ts +12 -2
- package/package.json +3 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Bundle } from '@openshift-assisted/types/assisted-installer-service';
|
|
2
2
|
declare const BundleAPI: {
|
|
3
3
|
makeBaseURI(): string;
|
|
4
|
-
list(): Promise<import("axios").AxiosResponse<Bundle[], any, {}>>;
|
|
4
|
+
list(openshiftVersion?: string, cpuArchitecture?: string, platformType?: string, featureIds?: string): Promise<import("axios").AxiosResponse<Bundle[], any, {}>>;
|
|
5
5
|
listOperatorsForBundle(bundleName: string): Promise<import("axios").AxiosResponse<string[], any, {}>>;
|
|
6
6
|
};
|
|
7
7
|
export default BundleAPI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleAPI.d.ts","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/BundleAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sDAAsD,CAAC;AAE9E,QAAA,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"BundleAPI.d.ts","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/BundleAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sDAAsD,CAAC;AAE9E,QAAA,MAAM,SAAS;;4BAMQ,MAAM,oBACP,MAAM,iBACT,MAAM,eACR,MAAM;uCAac,MAAM;CAG1C,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoC3C,eAAO,MAAM,mBAAmB,YAAa,cAAc,KAAG,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoC3C,eAAO,MAAM,mBAAmB,YAAa,cAAc,KAAG,gBA0C7D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundleSpecs.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,MAAM,UAAU,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"bundleSpecs.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,MAAM,UAAU,GAAG;IACvB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CA8BpD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewSummary.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ReviewSummary.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAoB1B,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAE/E,eAAO,MAAM,oBAAoB;aAA4B,OAAO;uBA4CnE,CAAC;AAEF,QAAA,MAAM,aAAa;aAA4B,OAAO;uBAWrD,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAIzF,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,cAAc,0BAA2B,mBAAmB,
|
|
1
|
+
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAIzF,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,cAAc,0BAA2B,mBAAmB,sBAqIjE,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { Bundle, PreflightHardwareRequirements } from '@openshift-assisted/types/assisted-installer-service';
|
|
3
3
|
import './OperatorsBundle.css';
|
|
4
|
-
declare const OperatorsBundle: ({ bundles, preflightRequirements, searchTerm, }: {
|
|
4
|
+
declare const OperatorsBundle: ({ bundles, allBundles, preflightRequirements, searchTerm, }: {
|
|
5
5
|
bundles: Bundle[];
|
|
6
|
+
allBundles: Bundle[];
|
|
6
7
|
preflightRequirements: PreflightHardwareRequirements | undefined;
|
|
7
8
|
searchTerm?: string | undefined;
|
|
8
9
|
}) => React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsBundle.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EACL,MAAM,EACN,6BAA6B,EAC9B,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"OperatorsBundle.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EACL,MAAM,EACN,6BAA6B,EAC9B,MAAM,sDAAsD,CAAC;AAY9D,OAAO,uBAAuB,CAAC;AAyI/B,QAAA,MAAM,eAAe;aAMV,MAAM,EAAE;gBACL,MAAM,EAAE;2BACG,6BAA6B,GAAG,SAAS;;uBA+BjE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsStep.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAC;AAMzB,eAAO,MAAM,aAAa,gBAAiB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"OperatorsStep.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAC;AAMzB,eAAO,MAAM,aAAa,gBAAiB,oBAAoB,sBA6F9D,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
declare const BundleService: {
|
|
2
|
-
listBundles(): Promise<import("@openshift-assisted/types/./assisted-installer-service").Bundle[]>;
|
|
2
|
+
listBundles(openshiftVersion?: string, cpuArchitecture?: string, platformType?: string, featureIds?: string): Promise<import("@openshift-assisted/types/./assisted-installer-service").Bundle[]>;
|
|
3
3
|
listOperatorsByBundle(bundleName: string): Promise<string[]>;
|
|
4
4
|
};
|
|
5
5
|
export default BundleService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleService.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"BundleService.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa;mCAEI,MAAM,oBACP,MAAM,iBACT,MAAM,eACR,MAAM;sCAUmB,MAAM;CAI/C,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -5,8 +5,10 @@ const BundleAPI = {
|
|
|
5
5
|
makeBaseURI() {
|
|
6
6
|
return `/v2/operators/bundles`;
|
|
7
7
|
},
|
|
8
|
-
list() {
|
|
9
|
-
return axiosClient_1.client.get(`${BundleAPI.makeBaseURI()}
|
|
8
|
+
list(openshiftVersion, cpuArchitecture, platformType, featureIds) {
|
|
9
|
+
return axiosClient_1.client.get(`${BundleAPI.makeBaseURI()}`, {
|
|
10
|
+
params: Object.assign({ openshift_version: openshiftVersion, cpu_architecture: cpuArchitecture, platform_type: platformType, feature_ids: featureIds }, (platformType === 'external' ? { external_platform_name: 'oci' } : {})),
|
|
11
|
+
});
|
|
10
12
|
},
|
|
11
13
|
listOperatorsForBundle(bundleName) {
|
|
12
14
|
return axiosClient_1.client.get(`${BundleAPI.makeBaseURI()}?bundle_name=${bundleName}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleAPI.js","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/BundleAPI.ts"],"names":[],"mappings":";;AAAA,gDAAwC;AAGxC,MAAM,SAAS,GAAG;IAChB,WAAW;QACT,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,IAAI;
|
|
1
|
+
{"version":3,"file":"BundleAPI.js","sourceRoot":"","sources":["../../../../../lib/common/api/assisted-service/BundleAPI.ts"],"names":[],"mappings":";;AAAA,gDAAwC;AAGxC,MAAM,SAAS,GAAG;IAChB,WAAW;QACT,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,IAAI,CACF,gBAAyB,EACzB,eAAwB,EACxB,YAAqB,EACrB,UAAmB;QAEnB,OAAO,oBAAM,CAAC,GAAG,CAAW,GAAG,SAAS,CAAC,WAAW,EAAE,EAAE,EAAE;YACxD,MAAM,kBACJ,iBAAiB,EAAE,gBAAgB,EACnC,gBAAgB,EAAE,eAAe,EACjC,aAAa,EAAE,YAAY,EAC3B,WAAW,EAAE,UAAU,IACpB,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1E;SACF,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CAAC,UAAkB;QACvC,OAAO,oBAAM,CAAC,GAAG,CAAW,GAAG,SAAS,CAAC,WAAW,EAAE,gBAAgB,UAAU,EAAE,CAAC,CAAC;IACtF,CAAC;CACF,CAAC;AAEF,kBAAe,SAAS,CAAC"}
|
|
@@ -42,19 +42,26 @@ const getAddHostsTabState = (cluster) => {
|
|
|
42
42
|
const wasInstalledUsingAssistedInstaller = ((_b = cluster.product) === null || _b === void 0 ? void 0 : _b.id) === 'OCP-AssistedInstall';
|
|
43
43
|
// Checking if the Day1 cluster has reported metrics, so it can be determined if it's an SNO / multi node and has required information
|
|
44
44
|
const day1ClusterHostCount = ((_d = (_c = cluster.metrics) === null || _c === void 0 ? void 0 : _c.nodes) === null || _d === void 0 ? void 0 : _d.total) || 0;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return tabState;
|
|
45
|
+
// Disable Add Hosts with the following priority:
|
|
46
|
+
// 1) Cluster is not ready
|
|
47
|
+
// 2) Cluster was not installed using Assisted Installer
|
|
48
|
+
// 3) Cluster has no metrics
|
|
49
|
+
if (!isClusterStateReady) {
|
|
50
|
+
return makeState('disabled', 'Cluster is not ready. Please wait for the cluster to be ready and try again.');
|
|
52
51
|
}
|
|
53
|
-
else {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
else if (!wasInstalledUsingAssistedInstaller) {
|
|
53
|
+
return makeState('disabled', 'Hosts cannot be added to an existing cluster that was not installed using Assisted Installer. Install a new cluster and try again.');
|
|
54
|
+
}
|
|
55
|
+
else if (!cluster.metrics) {
|
|
56
|
+
return makeState('disabled', 'Cluster has no metrics. Please wait for the cluster to have metrics and try again.');
|
|
57
|
+
}
|
|
58
|
+
// At this point the cluster is ready, installed using Assisted Installer, and has metrics
|
|
59
|
+
let tabState = makeState('visible');
|
|
60
|
+
if (day1ClusterHostCount === 1 && !isSNOExpansionAllowed(cluster)) {
|
|
61
|
+
// The cluster has metrics etc., but it's an SNO with an OpenshiftVersion that doesn't support Day2 flow
|
|
62
|
+
tabState = makeState('disabled', 'OpenShift version not supported for SNO expansion. Hosts cannot be added to an existing SNO cluster that was installed with any OpenShift version older than 4.11. Upgrade to a newer OpenShift version and try again.');
|
|
57
63
|
}
|
|
64
|
+
return tabState;
|
|
58
65
|
};
|
|
59
66
|
exports.getAddHostsTabState = getAddHostsTabState;
|
|
60
67
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":";;;AACA,qGAA0F;AAG1F,MAAM,qBAAqB,GAAG,CAAC,OAAuB,EAAE,EAAE;IACxD,IAAI,OAAO,CAAC,eAAe,EAAE;QAC3B,OAAO,IAAA,iDAAmB,EAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,IAAI,EAAE,EAAE,uBAAuB,CAAC,CAAC;KAC7F;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,KAAwC,EACxC,cAAc,GAAG,EAAE,EACD,EAAE;IACpB,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,EAAE;aACf,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,cAAc;aAC3B,CAAC;QACJ,KAAK,UAAU;YACb,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,cAAc;aAC3B,CAAC;KACL;AACH,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAuB,EAAoB,EAAE;;IAC/E,4EAA4E;IAC5E,wFAAwF;IACxF,MAAM,mBAAmB,GAAG,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,MAAM;QACnD,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;QAClD,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,kCAAkC,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,EAAE,MAAK,qBAAqB,CAAC;IACzF,sIAAsI;IACtI,MAAM,oBAAoB,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,KAAK,KAAI,CAAC,CAAC;IAEhE,IAAI,mBAAmB,IAAI,kCAAkC,EAAE;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/utils.ts"],"names":[],"mappings":";;;AACA,qGAA0F;AAG1F,MAAM,qBAAqB,GAAG,CAAC,OAAuB,EAAE,EAAE;IACxD,IAAI,OAAO,CAAC,eAAe,EAAE;QAC3B,OAAO,IAAA,iDAAmB,EAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,IAAI,EAAE,EAAE,uBAAuB,CAAC,CAAC;KAC7F;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,KAAwC,EACxC,cAAc,GAAG,EAAE,EACD,EAAE;IACpB,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,EAAE;aACf,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,cAAc;aAC3B,CAAC;QACJ,KAAK,UAAU;YACb,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,cAAc;aAC3B,CAAC;KACL;AACH,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAuB,EAAoB,EAAE;;IAC/E,4EAA4E;IAC5E,wFAAwF;IACxF,MAAM,mBAAmB,GAAG,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,MAAM;QACnD,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;QAClD,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,kCAAkC,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,EAAE,MAAK,qBAAqB,CAAC;IACzF,sIAAsI;IACtI,MAAM,oBAAoB,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,KAAK,KAAI,CAAC,CAAC;IAEhE,iDAAiD;IACjD,0BAA0B;IAC1B,wDAAwD;IACxD,4BAA4B;IAC5B,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CACd,UAAU,EACV,8EAA8E,CAC/E,CAAC;KACH;SAAM,IAAI,CAAC,kCAAkC,EAAE;QAC9C,OAAO,SAAS,CACd,UAAU,EACV,oIAAoI,CACrI,CAAC;KACH;SAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QAC3B,OAAO,SAAS,CACd,UAAU,EACV,oFAAoF,CACrF,CAAC;KACH;IAED,0FAA0F;IAC1F,IAAI,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,oBAAoB,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACjE,wGAAwG;QACxG,QAAQ,GAAG,SAAS,CAClB,UAAU,EACV,wNAAwN,CACzN,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA1CW,QAAA,mBAAmB,uBA0C9B"}
|
|
@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
|
|
|
6
6
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
exports.bundleSpecs = {
|
|
8
8
|
virtualization: {
|
|
9
|
-
noSNO: true,
|
|
10
9
|
Description: () => (React.createElement(react_core_1.List, null,
|
|
11
10
|
React.createElement(react_core_1.ListItem, null, "Enabled CPU virtualization support in BIOS (Intel-VT / AMD-V) on all nodes."),
|
|
12
11
|
React.createElement(react_core_1.ListItem, null, "Each control plane node requires an additional 1024 MiB of memory and 3 CPU cores."),
|
|
@@ -14,7 +13,6 @@ exports.bundleSpecs = {
|
|
|
14
13
|
React.createElement(react_core_1.ListItem, null, "Additional resources may be required to support the selected storage operator."))),
|
|
15
14
|
},
|
|
16
15
|
'openshift-ai': {
|
|
17
|
-
noSNO: true,
|
|
18
16
|
incompatibleBundles: [],
|
|
19
17
|
Description: () => (React.createElement(react_core_1.List, null,
|
|
20
18
|
React.createElement(react_core_1.ListItem, null, "NVIDIA GPU, AMD GPU and Kernel Module Management may or may not be installed based on the GPU discovered on your hosts."))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundleSpecs.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,uDAAwD;
|
|
1
|
+
{"version":3,"file":"bundleSpecs.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,uDAAwD;AAQ3C,QAAA,WAAW,GAAkC;IACxD,cAAc,EAAE;QACd,WAAW,EAAE,GAAG,EAAE,CAAC,CACjB,oBAAC,iBAAI;YACH,oBAAC,qBAAQ,sFAEE;YACX,oBAAC,qBAAQ,6FAEE;YACX,oBAAC,qBAAQ,sFAEE;YACX,oBAAC,qBAAQ,yFAEE,CACN,CACR;KACF;IACD,cAAc,EAAE;QACd,mBAAmB,EAAE,EAAE;QACvB,WAAW,EAAE,GAAG,EAAE,CAAC,CACjB,oBAAC,iBAAI;YACH,oBAAC,qBAAQ,kIAGE,CACN,CACR;KACF;CACF,CAAC"}
|
|
@@ -18,14 +18,12 @@
|
|
|
18
18
|
width: 100%;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
#summary-expandable > .pf-v6-c-expandable-section__toggle .pf-v6-c-button__text,
|
|
22
22
|
.review-expandable > .pf-v6-c-expandable-section__toggle {
|
|
23
23
|
color: initial;
|
|
24
24
|
text-align: left;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
> .pf-v6-c-expandable-section__toggle
|
|
29
|
-
> .pf-v6-c-expandable-section__toggle-icon {
|
|
27
|
+
#summary-expandable > .pf-v6-c-expandable-section__toggle .pf-v6-c-button__icon {
|
|
30
28
|
visibility: hidden;
|
|
31
29
|
}
|
|
@@ -75,7 +75,7 @@ const ReviewPreflightChecks = ({ cluster }) => {
|
|
|
75
75
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
76
76
|
react_1.default.createElement(react_core_1.Divider, null),
|
|
77
77
|
react_1.default.createElement(react_core_1.ExpandableSection, { toggleContent: react_1.default.createElement(react_core_1.Grid, null,
|
|
78
|
-
react_1.default.createElement(react_core_1.GridItem, { span: 2, className: "pf-v6-u-text-wrap" }, "Preflight checks"),
|
|
78
|
+
react_1.default.createElement(react_core_1.GridItem, { span: 2, className: "pf-v6-u-text-wrap pf-v6-u-text-align-start" }, "Preflight checks"),
|
|
79
79
|
!isChecksExpanded && react_1.default.createElement(PreflightChecksDetailCollapsed, { cluster: cluster })), isIndented: true, isExpanded: isChecksExpanded, onToggle: () => setChecksExpanded(!isChecksExpanded), className: 'review-expandable', "data-testid": "review-preflight-checks-main" },
|
|
80
80
|
react_1.default.createElement(PreflightChecksDetailExpanded, { cluster: cluster })),
|
|
81
81
|
react_1.default.createElement(react_core_1.Divider, null)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewPreflightChecks.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ReviewPreflightChecks.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ReviewSummaryContent = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
|
+
const react_core_1 = require("@patternfly/react-core");
|
|
6
7
|
const common_1 = require("../../../../common");
|
|
7
8
|
const _1 = require(".");
|
|
8
9
|
const ReviewCustomManifestsTable_1 = require("./ReviewCustomManifestsTable");
|
|
@@ -30,7 +31,7 @@ const ReviewSummaryContent = ({ cluster }) => {
|
|
|
30
31
|
};
|
|
31
32
|
exports.ReviewSummaryContent = ReviewSummaryContent;
|
|
32
33
|
const ReviewSummary = ({ cluster }) => {
|
|
33
|
-
return (react_1.default.createElement(
|
|
34
|
+
return (react_1.default.createElement(react_core_1.ExpandableSection, { toggleContent: 'Cluster summary', id: 'summary-expandable', isExpanded: true, isIndented: true },
|
|
34
35
|
react_1.default.createElement(exports.ReviewSummaryContent, { cluster: cluster })));
|
|
35
36
|
};
|
|
36
37
|
exports.default = ReviewSummary;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewSummary.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,+CAO4B;AAC5B,wBAMW;AACX,6EAA0E;AAC1E,qHAAqF;AACrF,iHAAiF;AAG1E,MAAM,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;;IACxE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACzE,OAAO,CACL;QACE,8BAAC,yBAAsB,IAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,4BAA4B;YAChF,8BAAC,2BAAwB,IAAC,OAAO,EAAE,OAAO,GAAI,CACvB;QAEzB,8BAAC,uBAAoB,IAAC,OAAO,EAAE,OAAO,GAAI;QAE1C,8BAAC,yBAAsB,IAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,EAAE,2BAA2B;YAC9E;gBACE,8BAAC,6BAAoB,IAAC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAI;gBAC9C,8BAAC,iBAAQ,IAAC,SAAS,EAAE,IAAA,gCAAuB,EAAC,OAAO,CAAC;oBACnD,8BAAC,mBAAU;wBACT,8BAAC,mBAAU,IACT,KAAK,EAAE,sBAAsB,EAC7B,KAAK,EACH;gCACE,8BAAC,sBAAmB,IAAC,OAAO,EAAE,OAAO,GAAI;gCACzC,8BAAC,iCAAuB,IACtB,YAAY,EAAE,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAA6B,GAC7D,CACD,EAEL,MAAM,EAAC,2BAA2B,EAClC,cAAc,EAAE,eAAe,GAC/B,CACS,CACJ,CACV,CACoB;QAEzB,8BAAC,yBAAsB,IAAC,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,uBAAuB;YACtE,8BAAC,wBAAqB,IAAC,OAAO,EAAE,OAAO,GAAI,CACpB;QAExB,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,CAChD,8BAAC,yBAAsB,IAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,6BAA6B;YAClF,8BAAC,uDAA0B,IAAC,SAAS,EAAE,eAAe,GAAI,CACnC,CAC1B,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B;AAEF,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IAC1D,OAAO,CACL,8BAAC,
|
|
1
|
+
{"version":3,"file":"ReviewSummary.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAA2D;AAC3D,+CAO4B;AAC5B,wBAMW;AACX,6EAA0E;AAC1E,qHAAqF;AACrF,iHAAiF;AAG1E,MAAM,oBAAoB,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;;IACxE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACzE,OAAO,CACL;QACE,8BAAC,yBAAsB,IAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,4BAA4B;YAChF,8BAAC,2BAAwB,IAAC,OAAO,EAAE,OAAO,GAAI,CACvB;QAEzB,8BAAC,uBAAoB,IAAC,OAAO,EAAE,OAAO,GAAI;QAE1C,8BAAC,yBAAsB,IAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,EAAE,2BAA2B;YAC9E;gBACE,8BAAC,6BAAoB,IAAC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAI;gBAC9C,8BAAC,iBAAQ,IAAC,SAAS,EAAE,IAAA,gCAAuB,EAAC,OAAO,CAAC;oBACnD,8BAAC,mBAAU;wBACT,8BAAC,mBAAU,IACT,KAAK,EAAE,sBAAsB,EAC7B,KAAK,EACH;gCACE,8BAAC,sBAAmB,IAAC,OAAO,EAAE,OAAO,GAAI;gCACzC,8BAAC,iCAAuB,IACtB,YAAY,EAAE,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAA6B,GAC7D,CACD,EAEL,MAAM,EAAC,2BAA2B,EAClC,cAAc,EAAE,eAAe,GAC/B,CACS,CACJ,CACV,CACoB;QAEzB,8BAAC,yBAAsB,IAAC,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,uBAAuB;YACtE,8BAAC,wBAAqB,IAAC,OAAO,EAAE,OAAO,GAAI,CACpB;QAExB,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,CAChD,8BAAC,yBAAsB,IAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,6BAA6B;YAClF,8BAAC,uDAA0B,IAAC,SAAS,EAAE,eAAe,GAAI,CACnC,CAC1B,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B;AAEF,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IAC1D,OAAO,CACL,8BAAC,8BAAiB,IAChB,aAAa,EAAE,iBAAiB,EAChC,EAAE,EAAE,oBAAoB,EACxB,UAAU,EAAE,IAAI,EAChB,UAAU;QAEV,8BAAC,4BAAoB,IAAC,OAAO,EAAE,OAAO,GAAI,CACxB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -6,7 +6,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
|
|
|
6
6
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const TableSummaryExpandable = ({ title, children, id, }) => {
|
|
8
8
|
const [isExpanded, setExpanded] = react_1.default.useState(true);
|
|
9
|
-
return (react_1.default.createElement(react_core_1.ExpandableSection, { toggleContent: react_1.default.createElement("
|
|
9
|
+
return (react_1.default.createElement(react_core_1.ExpandableSection, { toggleContent: react_1.default.createElement(react_core_1.Content, { className: "pf-v6-u-font-weight-bold" }, title), isExpanded: isExpanded, onToggle: () => setExpanded(!isExpanded), isIndented: true, id: id ? id : title },
|
|
10
10
|
children,
|
|
11
11
|
react_1.default.createElement("br", null)));
|
|
12
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableSummaryExpandable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/TableSummaryExpandable.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"TableSummaryExpandable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/TableSummaryExpandable.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAoE;AAE7D,MAAM,sBAAsB,GAAG,CAAC,EACrC,KAAK,EACL,QAAQ,EACR,EAAE,GAKH,EAAE,EAAE;IACH,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,CACL,8BAAC,8BAAiB,IAChB,aAAa,EAAE,8BAAC,oBAAO,IAAC,SAAS,EAAC,0BAA0B,IAAE,KAAK,CAAW,EAC9E,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,EACxC,UAAU,QACV,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;QAElB,QAAQ;QACT,yCAAM,CACY,CACrB,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,sBAAsB,0BAsBjC"}
|
|
@@ -44,6 +44,7 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
44
44
|
}
|
|
45
45
|
}), [clearAlerts, addAlert, dispatch, cluster === null || cluster === void 0 ? void 0 : cluster.tags, clusterWizardContext]);
|
|
46
46
|
const handleClusterCreate = react_1.default.useCallback((params, addCustomManifests) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
var _a;
|
|
47
48
|
clearAlerts();
|
|
48
49
|
try {
|
|
49
50
|
const searchParams = new URLSearchParams(location.search);
|
|
@@ -51,7 +52,7 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
51
52
|
//For Assisted Migration we need the LVMs operator and also the virtualization bundle operators
|
|
52
53
|
if (isAssistedMigration) {
|
|
53
54
|
params.olmOperators = [{ name: 'lvm' }];
|
|
54
|
-
const selectedBundle = (yield BundleService_1.default.listBundles()).find((b) => b.id === 'virtualization');
|
|
55
|
+
const selectedBundle = (yield BundleService_1.default.listBundles(params.openshiftVersion, params.cpuArchitecture, (_a = params.platform) === null || _a === void 0 ? void 0 : _a.type)).find((b) => b.id === 'virtualization');
|
|
55
56
|
const virtOperators = selectedBundle === null || selectedBundle === void 0 ? void 0 : selectedBundle.operators;
|
|
56
57
|
params.olmOperators = [
|
|
57
58
|
...params.olmOperators,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,2EAAsE;AACtE,6CAA0C;AAC1C,4CAMyB;AACzB,uCAA4C;AAC5C,6CAA+F;AAC/F,oEAA+F;AAC/F,iEAAiE;AACjE,yDAAsF;AACtF,uCAAqE;AACrE,yEAAyE;AACzE,sFAAsD;AACtD,gGAAgE;AAChE,6CAKwB;AAExB,yFAAyD;AACzD,yDAAqD;AAOrD,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAuB,EAAE,EAAE;IACpE,MAAM,oBAAoB,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACvD,MAAM,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;IAC3C,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,2BAAmB,EAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,EAAE,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,IAAA,qBAAa,GAAE,CAAC;IACnC,MAAM,EACJ,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,QAAQ,GACzB,GAAG,IAAA,sDAA2B,GAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,mBAAmB,GAAG,eAAK,CAAC,WAAW,CAC3C,CACE,SAAwB,EACxB,MAAkC,EAClC,kBAA2B,EAC3B,EAAE;QACF,WAAW,EAAE,CAAC;QAEd,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,0BAAe,CAAC,MAAM,CAC3D,SAAS,EACT,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EACb,MAAM,CACP,CAAC;YACF,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACpE,QAAQ,CAAC,IAAA,qBAAa,EAAC,cAAc,CAAC,CAAC,CAAC;YAExC,IAAA,wCAAqB,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,oBAAoB,CAAC,QAAQ,EAAE,CAAC;SACvF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC,EAAE,CAAC,CACpF,CAAC;YACF,IAAI,IAAA,0BAAoB,EAAC,CAAU,CAAC,EAAE;gBACpC,QAAQ,CAAC,IAAA,4BAAoB,GAAE,CAAC,CAAC;aAClC;SACF;IACH,CAAC,CAAA,EACD,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,oBAAoB,CAAC,CACvE,CAAC;IAEF,MAAM,mBAAmB,GAAG,eAAK,CAAC,WAAW,CAC3C,CAAO,MAA+C,EAAE,kBAA2B,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,6 @@ const common_1 = require("../../../common");
|
|
|
7
7
|
const formik_1 = require("formik");
|
|
8
8
|
const newFeatureSupportLevels_1 = require("../../../common/components/newFeatureSupportLevels");
|
|
9
9
|
const use_feature_1 = require("../../hooks/use-feature");
|
|
10
|
-
const react_redux_1 = require("react-redux");
|
|
11
|
-
const selectors_1 = require("../../store/slices/current-cluster/selectors");
|
|
12
10
|
const utils_1 = require("../clusterConfiguration/operators/utils");
|
|
13
11
|
const bundleSpecs_1 = require("../clusterConfiguration/operators/bundleSpecs");
|
|
14
12
|
const operatorSpecs_1 = require("../../../common/components/operators/operatorSpecs");
|
|
@@ -38,7 +36,6 @@ const BundleLabel = ({ bundle, searchTerm }) => {
|
|
|
38
36
|
const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) => {
|
|
39
37
|
var _a, _b, _c;
|
|
40
38
|
const { values, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
41
|
-
const isSNO = (0, react_redux_1.useSelector)(selectors_1.selectIsCurrentClusterSNO);
|
|
42
39
|
const { isFeatureSupported } = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
|
|
43
40
|
const { byKey: opSpecs } = (0, operatorSpecs_1.useOperatorSpecs)();
|
|
44
41
|
const { uiSettings } = (0, ClusterWizardContext_1.useClusterWizardContext)();
|
|
@@ -54,14 +51,12 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
|
|
|
54
51
|
const isAssistedMigration = uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.isAssistedMigration;
|
|
55
52
|
const disabledReason = hasUnsupportedOperators
|
|
56
53
|
? 'Some operators in this bundle are not supported with the current configuration.'
|
|
57
|
-
:
|
|
58
|
-
?
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
: isAssistedMigration
|
|
64
|
-
? 'This bundle needs to be selected for clusters created from Migration Assessment'
|
|
54
|
+
: incompatibleBundle
|
|
55
|
+
? `Bundle cannot be installed together with ${((_c = bundles.find(({ id }) => id === incompatibleBundle)) === null || _c === void 0 ? void 0 : _c.title) || incompatibleBundle}`
|
|
56
|
+
: isAssistedMigration
|
|
57
|
+
? 'This bundle needs to be selected for clusters created from Migration Assessment'
|
|
58
|
+
: !bundles.some((b) => b.id === bundle.id)
|
|
59
|
+
? 'This bundle is not available for the current configuration, you might be able to use the standalone operators instead.'
|
|
65
60
|
: undefined;
|
|
66
61
|
const onSelect = (checked) => {
|
|
67
62
|
const newBundles = checked
|
|
@@ -89,16 +84,16 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
|
|
|
89
84
|
React.createElement(react_core_1.StackItem, { isFilled: true },
|
|
90
85
|
React.createElement("div", null, (0, operatorSpecs_1.highlightMatch)(bundle.description || '', searchTerm))))))));
|
|
91
86
|
};
|
|
92
|
-
const OperatorsBundle = ({ bundles, preflightRequirements, searchTerm, }) => {
|
|
87
|
+
const OperatorsBundle = ({ bundles, allBundles, preflightRequirements, searchTerm, }) => {
|
|
93
88
|
const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
94
89
|
return (React.createElement(react_core_1.Stack, { hasGutter: true },
|
|
95
90
|
React.createElement(react_core_1.StackItem, null,
|
|
96
|
-
React.createElement(react_core_1.Title, { headingLevel: "h2", size: "lg" },
|
|
91
|
+
React.createElement(react_core_1.Title, { headingLevel: "h2", size: "lg" }, allBundles.length > 0 ? 'Bundles' : '')),
|
|
97
92
|
React.createElement(react_core_1.StackItem, null,
|
|
98
93
|
React.createElement(react_core_1.Gallery, { hasGutter: true, minWidths: { default: '350px' } }, (isSingleClusterFeatureEnabled
|
|
99
|
-
?
|
|
100
|
-
:
|
|
101
|
-
React.createElement(BundleCard, { bundle: bundle, bundles: bundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm }))))))));
|
|
94
|
+
? allBundles.filter((b) => b.id && common_1.singleClusterBundles.includes(b.id))
|
|
95
|
+
: allBundles).map((bundle) => (React.createElement(react_core_1.GalleryItem, { key: bundle.id },
|
|
96
|
+
React.createElement(BundleCard, { bundle: bundles.find((b) => b.id === bundle.id) || bundle, bundles: bundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm }))))))));
|
|
102
97
|
};
|
|
103
98
|
exports.default = OperatorsBundle;
|
|
104
99
|
//# sourceMappingURL=OperatorsBundle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAagC;AAKhC,4CAAmG;AACnG,mCAA0C;AAC1C,gGAA+F;AAC/F,yDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,16 +10,21 @@ const OperatorsSelect_1 = tslib_1.__importDefault(require("./OperatorsSelect"));
|
|
|
10
10
|
const BundleService_1 = tslib_1.__importDefault(require("../../services/BundleService"));
|
|
11
11
|
const hooks_1 = require("../../hooks");
|
|
12
12
|
const OperatorsStep = ({ cluster }) => {
|
|
13
|
+
var _a;
|
|
13
14
|
const { addAlert } = (0, common_1.useAlerts)();
|
|
14
15
|
const [bundlesLoading, setBundlesLoading] = react_1.default.useState(true);
|
|
15
16
|
const [bundles, setBundles] = react_1.default.useState([]);
|
|
17
|
+
const [allBundles, setAllBundles] = react_1.default.useState([]);
|
|
16
18
|
const { preflightRequirements, isLoading } = (0, hooks_1.useClusterPreflightRequirements)(cluster.id);
|
|
17
19
|
const [searchTerm, setSearchTerm] = react_1.default.useState('');
|
|
18
20
|
react_1.default.useEffect(() => {
|
|
19
21
|
const fetchBundles = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
var _a, _b;
|
|
20
23
|
try {
|
|
21
|
-
const fetchedBundles = yield BundleService_1.default.listBundles();
|
|
24
|
+
const fetchedBundles = yield BundleService_1.default.listBundles((cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) || '', ((_a = cluster === null || cluster === void 0 ? void 0 : cluster.platform) === null || _a === void 0 ? void 0 : _a.type) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.controlPlaneCount) === 1 ? 'SNO' : undefined);
|
|
25
|
+
const allBundles = yield BundleService_1.default.listBundles((cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) || '', ((_b = cluster === null || cluster === void 0 ? void 0 : cluster.platform) === null || _b === void 0 ? void 0 : _b.type) || '', undefined);
|
|
22
26
|
setBundles(fetchedBundles);
|
|
27
|
+
setAllBundles(allBundles);
|
|
23
28
|
}
|
|
24
29
|
catch (error) {
|
|
25
30
|
(0, common_1.handleApiError)(error, () => addAlert({
|
|
@@ -32,7 +37,13 @@ const OperatorsStep = ({ cluster }) => {
|
|
|
32
37
|
}
|
|
33
38
|
});
|
|
34
39
|
void fetchBundles();
|
|
35
|
-
}, [
|
|
40
|
+
}, [
|
|
41
|
+
addAlert,
|
|
42
|
+
cluster.cpuArchitecture,
|
|
43
|
+
cluster.openshiftVersion,
|
|
44
|
+
(_a = cluster.platform) === null || _a === void 0 ? void 0 : _a.type,
|
|
45
|
+
cluster.controlPlaneCount,
|
|
46
|
+
]);
|
|
36
47
|
const filteredBundles = bundles.filter((bundle) => {
|
|
37
48
|
var _a, _b;
|
|
38
49
|
return ((_a = bundle.title) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(searchTerm.toLowerCase())) ||
|
|
@@ -49,7 +60,7 @@ const OperatorsStep = ({ cluster }) => {
|
|
|
49
60
|
react_1.default.createElement(react_core_1.FlexItem, { style: { minWidth: '300px' } },
|
|
50
61
|
react_1.default.createElement(react_core_1.SearchInput, { placeholder: 'Find bundles or operators', value: searchTerm, onChange: (_e, value) => setSearchTerm(value), onClear: () => setSearchTerm('') })))),
|
|
51
62
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
52
|
-
react_1.default.createElement(OperatorsBundle_1.default, { bundles: filteredBundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm })),
|
|
63
|
+
react_1.default.createElement(OperatorsBundle_1.default, { bundles: filteredBundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm, allBundles: allBundles })),
|
|
53
64
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
54
65
|
react_1.default.createElement(OperatorsSelect_1.default, { bundles: bundles, cluster: cluster, preflightRequirements: preflightRequirements, searchTerm: searchTerm }))));
|
|
55
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsStep.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAuF;AAEvF,4CAOyB;AACzB,gFAAgD;AAChD,gFAAgD;AAChD,yFAAyD;AACzD,uCAA8D;AAEvD,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"OperatorsStep.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const BundleAPI_1 = tslib_1.__importDefault(require("../../common/api/assisted-service/BundleAPI"));
|
|
5
5
|
const BundleService = {
|
|
6
|
-
listBundles() {
|
|
6
|
+
listBundles(openshiftVersion, cpuArchitecture, platformType, featureIds) {
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const { data: bundles } = yield BundleAPI_1.default.list();
|
|
8
|
+
const { data: bundles } = yield BundleAPI_1.default.list(openshiftVersion, cpuArchitecture, platformType, featureIds);
|
|
9
9
|
return bundles;
|
|
10
10
|
});
|
|
11
11
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":";;;AAAA,oGAAoE;AAEpE,MAAM,aAAa,GAAG;IACd,WAAW;;
|
|
1
|
+
{"version":3,"file":"BundleService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":";;;AAAA,oGAAoE;AAEpE,MAAM,aAAa,GAAG;IACd,WAAW,CACf,gBAAyB,EACzB,eAAwB,EACxB,YAAqB,EACrB,UAAmB;;YAEnB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,mBAAS,CAAC,IAAI,CAC5C,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,UAAU,CACX,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IACK,qBAAqB,CAAC,UAAkB;;YAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;CACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -6,8 +6,21 @@ const BundleAPI = {
|
|
|
6
6
|
return `/v2/operators/bundles`;
|
|
7
7
|
},
|
|
8
8
|
|
|
9
|
-
list(
|
|
10
|
-
|
|
9
|
+
list(
|
|
10
|
+
openshiftVersion?: string,
|
|
11
|
+
cpuArchitecture?: string,
|
|
12
|
+
platformType?: string,
|
|
13
|
+
featureIds?: string,
|
|
14
|
+
) {
|
|
15
|
+
return client.get<Bundle[]>(`${BundleAPI.makeBaseURI()}`, {
|
|
16
|
+
params: {
|
|
17
|
+
openshift_version: openshiftVersion,
|
|
18
|
+
cpu_architecture: cpuArchitecture,
|
|
19
|
+
platform_type: platformType,
|
|
20
|
+
feature_ids: featureIds,
|
|
21
|
+
...(platformType === 'external' ? { external_platform_name: 'oci' } : {}),
|
|
22
|
+
},
|
|
23
|
+
});
|
|
11
24
|
},
|
|
12
25
|
|
|
13
26
|
listOperatorsForBundle(bundleName: string) {
|
|
@@ -46,20 +46,36 @@ export const getAddHostsTabState = (cluster: OcmClusterType): AddHostsTabState =
|
|
|
46
46
|
// Checking if the Day1 cluster has reported metrics, so it can be determined if it's an SNO / multi node and has required information
|
|
47
47
|
const day1ClusterHostCount = cluster.metrics?.nodes?.total || 0;
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
49
|
+
// Disable Add Hosts with the following priority:
|
|
50
|
+
// 1) Cluster is not ready
|
|
51
|
+
// 2) Cluster was not installed using Assisted Installer
|
|
52
|
+
// 3) Cluster has no metrics
|
|
53
|
+
if (!isClusterStateReady) {
|
|
54
|
+
return makeState(
|
|
55
|
+
'disabled',
|
|
56
|
+
'Cluster is not ready. Please wait for the cluster to be ready and try again.',
|
|
57
|
+
);
|
|
58
|
+
} else if (!wasInstalledUsingAssistedInstaller) {
|
|
59
|
+
return makeState(
|
|
60
|
+
'disabled',
|
|
61
|
+
'Hosts cannot be added to an existing cluster that was not installed using Assisted Installer. Install a new cluster and try again.',
|
|
62
|
+
);
|
|
63
|
+
} else if (!cluster.metrics) {
|
|
64
|
+
return makeState(
|
|
65
|
+
'disabled',
|
|
66
|
+
'Cluster has no metrics. Please wait for the cluster to have metrics and try again.',
|
|
67
|
+
);
|
|
68
|
+
}
|
|
58
69
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
//
|
|
63
|
-
|
|
70
|
+
// At this point the cluster is ready, installed using Assisted Installer, and has metrics
|
|
71
|
+
let tabState = makeState('visible');
|
|
72
|
+
if (day1ClusterHostCount === 1 && !isSNOExpansionAllowed(cluster)) {
|
|
73
|
+
// The cluster has metrics etc., but it's an SNO with an OpenshiftVersion that doesn't support Day2 flow
|
|
74
|
+
tabState = makeState(
|
|
75
|
+
'disabled',
|
|
76
|
+
'OpenShift version not supported for SNO expansion. Hosts cannot be added to an existing SNO cluster that was installed with any OpenShift version older than 4.11. Upgrade to a newer OpenShift version and try again.',
|
|
77
|
+
);
|
|
64
78
|
}
|
|
79
|
+
|
|
80
|
+
return tabState;
|
|
65
81
|
};
|
|
@@ -2,7 +2,6 @@ import * as React from 'react';
|
|
|
2
2
|
import { List, ListItem } from '@patternfly/react-core';
|
|
3
3
|
|
|
4
4
|
export type BundleSpec = {
|
|
5
|
-
noSNO?: boolean;
|
|
6
5
|
incompatibleBundles?: string[];
|
|
7
6
|
Description: React.ComponentType;
|
|
8
7
|
docsLink?: string;
|
|
@@ -10,7 +9,6 @@ export type BundleSpec = {
|
|
|
10
9
|
|
|
11
10
|
export const bundleSpecs: { [key: string]: BundleSpec } = {
|
|
12
11
|
virtualization: {
|
|
13
|
-
noSNO: true,
|
|
14
12
|
Description: () => (
|
|
15
13
|
<List>
|
|
16
14
|
<ListItem>
|
|
@@ -29,7 +27,6 @@ export const bundleSpecs: { [key: string]: BundleSpec } = {
|
|
|
29
27
|
),
|
|
30
28
|
},
|
|
31
29
|
'openshift-ai': {
|
|
32
|
-
noSNO: true,
|
|
33
30
|
incompatibleBundles: [],
|
|
34
31
|
Description: () => (
|
|
35
32
|
<List>
|
|
@@ -18,14 +18,12 @@
|
|
|
18
18
|
width: 100%;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
#summary-expandable > .pf-v6-c-expandable-section__toggle .pf-v6-c-button__text,
|
|
22
22
|
.review-expandable > .pf-v6-c-expandable-section__toggle {
|
|
23
23
|
color: initial;
|
|
24
24
|
text-align: left;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
> .pf-v6-c-expandable-section__toggle
|
|
29
|
-
> .pf-v6-c-expandable-section__toggle-icon {
|
|
27
|
+
#summary-expandable > .pf-v6-c-expandable-section__toggle .pf-v6-c-button__icon {
|
|
30
28
|
visibility: hidden;
|
|
31
29
|
}
|
|
@@ -182,7 +182,7 @@ const ReviewPreflightChecks = ({ cluster }: { cluster: Cluster }) => {
|
|
|
182
182
|
<ExpandableSection
|
|
183
183
|
toggleContent={
|
|
184
184
|
<Grid>
|
|
185
|
-
<GridItem span={2} className="pf-v6-u-text-wrap">
|
|
185
|
+
<GridItem span={2} className="pf-v6-u-text-wrap pf-v6-u-text-align-start">
|
|
186
186
|
Preflight checks
|
|
187
187
|
</GridItem>
|
|
188
188
|
{!isChecksExpanded && <PreflightChecksDetailCollapsed cluster={cluster} />}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { ExpandableSection } from '@patternfly/react-core';
|
|
2
3
|
import {
|
|
3
4
|
DetailItem,
|
|
4
5
|
DetailList,
|
|
@@ -67,9 +68,14 @@ export const ReviewSummaryContent = ({ cluster }: { cluster: Cluster }) => {
|
|
|
67
68
|
|
|
68
69
|
const ReviewSummary = ({ cluster }: { cluster: Cluster }) => {
|
|
69
70
|
return (
|
|
70
|
-
<
|
|
71
|
+
<ExpandableSection
|
|
72
|
+
toggleContent={'Cluster summary'}
|
|
73
|
+
id={'summary-expandable'}
|
|
74
|
+
isExpanded={true}
|
|
75
|
+
isIndented
|
|
76
|
+
>
|
|
71
77
|
<ReviewSummaryContent cluster={cluster} />
|
|
72
|
-
</
|
|
78
|
+
</ExpandableSection>
|
|
73
79
|
);
|
|
74
80
|
};
|
|
75
81
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { ExpandableSection } from '@patternfly/react-core';
|
|
2
|
+
import { ExpandableSection, Content } from '@patternfly/react-core';
|
|
3
3
|
|
|
4
4
|
export const TableSummaryExpandable = ({
|
|
5
5
|
title,
|
|
@@ -13,7 +13,7 @@ export const TableSummaryExpandable = ({
|
|
|
13
13
|
const [isExpanded, setExpanded] = React.useState(true);
|
|
14
14
|
return (
|
|
15
15
|
<ExpandableSection
|
|
16
|
-
toggleContent={<
|
|
16
|
+
toggleContent={<Content className="pf-v6-u-font-weight-bold">{title}</Content>}
|
|
17
17
|
isExpanded={isExpanded}
|
|
18
18
|
onToggle={() => setExpanded(!isExpanded)}
|
|
19
19
|
isIndented
|
|
@@ -87,9 +87,13 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
87
87
|
//For Assisted Migration we need the LVMs operator and also the virtualization bundle operators
|
|
88
88
|
if (isAssistedMigration) {
|
|
89
89
|
params.olmOperators = [{ name: 'lvm' }];
|
|
90
|
-
const selectedBundle = (
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
const selectedBundle = (
|
|
91
|
+
await BundleService.listBundles(
|
|
92
|
+
params.openshiftVersion,
|
|
93
|
+
params.cpuArchitecture,
|
|
94
|
+
params.platform?.type,
|
|
95
|
+
)
|
|
96
|
+
).find((b) => b.id === 'virtualization');
|
|
93
97
|
const virtOperators = selectedBundle?.operators;
|
|
94
98
|
params.olmOperators = [
|
|
95
99
|
...params.olmOperators,
|
|
@@ -21,8 +21,6 @@ import { ExternalLink, OperatorsValues, PopoverIcon, singleClusterBundles } from
|
|
|
21
21
|
import { useFormikContext } from 'formik';
|
|
22
22
|
import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
|
|
23
23
|
import { useFeature } from '../../hooks/use-feature';
|
|
24
|
-
import { useSelector } from 'react-redux';
|
|
25
|
-
import { selectIsCurrentClusterSNO } from '../../store/slices/current-cluster/selectors';
|
|
26
24
|
import { getNewBundleOperators } from '../clusterConfiguration/operators/utils';
|
|
27
25
|
import { bundleSpecs } from '../clusterConfiguration/operators/bundleSpecs';
|
|
28
26
|
import {
|
|
@@ -84,7 +82,6 @@ const BundleCard = ({
|
|
|
84
82
|
searchTerm?: string;
|
|
85
83
|
}) => {
|
|
86
84
|
const { values, setFieldValue } = useFormikContext<OperatorsValues>();
|
|
87
|
-
const isSNO = useSelector(selectIsCurrentClusterSNO);
|
|
88
85
|
const { isFeatureSupported } = useNewFeatureSupportLevel();
|
|
89
86
|
const { byKey: opSpecs } = useOperatorSpecs();
|
|
90
87
|
const { uiSettings } = useClusterWizardContext();
|
|
@@ -105,16 +102,14 @@ const BundleCard = ({
|
|
|
105
102
|
const isAssistedMigration = uiSettings?.isAssistedMigration;
|
|
106
103
|
const disabledReason = hasUnsupportedOperators
|
|
107
104
|
? 'Some operators in this bundle are not supported with the current configuration.'
|
|
108
|
-
: isSNO && bundleSpec?.noSNO
|
|
109
|
-
? bundle.id === 'openshift-ai'
|
|
110
|
-
? 'This bundle is not available when deploying a Single Node OpenShift, but you can use the standalone operator instead.'
|
|
111
|
-
: 'This bundle is not available when deploying a Single Node OpenShift.'
|
|
112
105
|
: incompatibleBundle
|
|
113
106
|
? `Bundle cannot be installed together with ${
|
|
114
107
|
bundles.find(({ id }) => id === incompatibleBundle)?.title || incompatibleBundle
|
|
115
108
|
}`
|
|
116
109
|
: isAssistedMigration
|
|
117
110
|
? 'This bundle needs to be selected for clusters created from Migration Assessment'
|
|
111
|
+
: !bundles.some((b) => b.id === bundle.id)
|
|
112
|
+
? 'This bundle is not available for the current configuration, you might be able to use the standalone operators instead.'
|
|
118
113
|
: undefined;
|
|
119
114
|
|
|
120
115
|
const onSelect = (checked: boolean) => {
|
|
@@ -172,10 +167,12 @@ const BundleCard = ({
|
|
|
172
167
|
|
|
173
168
|
const OperatorsBundle = ({
|
|
174
169
|
bundles,
|
|
170
|
+
allBundles,
|
|
175
171
|
preflightRequirements,
|
|
176
172
|
searchTerm,
|
|
177
173
|
}: {
|
|
178
174
|
bundles: Bundle[];
|
|
175
|
+
allBundles: Bundle[];
|
|
179
176
|
preflightRequirements: PreflightHardwareRequirements | undefined;
|
|
180
177
|
searchTerm?: string;
|
|
181
178
|
}) => {
|
|
@@ -185,18 +182,18 @@ const OperatorsBundle = ({
|
|
|
185
182
|
<Stack hasGutter>
|
|
186
183
|
<StackItem>
|
|
187
184
|
<Title headingLevel="h2" size="lg">
|
|
188
|
-
{
|
|
185
|
+
{allBundles.length > 0 ? 'Bundles' : ''}
|
|
189
186
|
</Title>
|
|
190
187
|
</StackItem>
|
|
191
188
|
<StackItem>
|
|
192
189
|
<Gallery hasGutter minWidths={{ default: '350px' }}>
|
|
193
190
|
{(isSingleClusterFeatureEnabled
|
|
194
|
-
?
|
|
195
|
-
:
|
|
191
|
+
? allBundles.filter((b) => b.id && singleClusterBundles.includes(b.id))
|
|
192
|
+
: allBundles
|
|
196
193
|
).map((bundle) => (
|
|
197
194
|
<GalleryItem key={bundle.id}>
|
|
198
195
|
<BundleCard
|
|
199
|
-
bundle={bundle}
|
|
196
|
+
bundle={bundles.find((b) => b.id === bundle.id) || bundle}
|
|
200
197
|
bundles={bundles}
|
|
201
198
|
preflightRequirements={preflightRequirements}
|
|
202
199
|
searchTerm={searchTerm}
|
|
@@ -18,13 +18,26 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
|
|
|
18
18
|
const { addAlert } = useAlerts();
|
|
19
19
|
const [bundlesLoading, setBundlesLoading] = React.useState(true);
|
|
20
20
|
const [bundles, setBundles] = React.useState<Bundle[]>([]);
|
|
21
|
+
const [allBundles, setAllBundles] = React.useState<Bundle[]>([]);
|
|
21
22
|
const { preflightRequirements, isLoading } = useClusterPreflightRequirements(cluster.id);
|
|
22
23
|
const [searchTerm, setSearchTerm] = React.useState('');
|
|
23
24
|
React.useEffect(() => {
|
|
24
25
|
const fetchBundles = async () => {
|
|
25
26
|
try {
|
|
26
|
-
const fetchedBundles = await BundleService.listBundles(
|
|
27
|
+
const fetchedBundles = await BundleService.listBundles(
|
|
28
|
+
cluster?.openshiftVersion || '',
|
|
29
|
+
cluster?.cpuArchitecture || '',
|
|
30
|
+
cluster?.platform?.type || '',
|
|
31
|
+
cluster?.controlPlaneCount === 1 ? 'SNO' : undefined,
|
|
32
|
+
);
|
|
33
|
+
const allBundles = await BundleService.listBundles(
|
|
34
|
+
cluster?.openshiftVersion || '',
|
|
35
|
+
cluster?.cpuArchitecture || '',
|
|
36
|
+
cluster?.platform?.type || '',
|
|
37
|
+
undefined,
|
|
38
|
+
);
|
|
27
39
|
setBundles(fetchedBundles);
|
|
40
|
+
setAllBundles(allBundles);
|
|
28
41
|
} catch (error) {
|
|
29
42
|
handleApiError(error, () =>
|
|
30
43
|
addAlert({
|
|
@@ -38,7 +51,13 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
|
|
|
38
51
|
};
|
|
39
52
|
|
|
40
53
|
void fetchBundles();
|
|
41
|
-
}, [
|
|
54
|
+
}, [
|
|
55
|
+
addAlert,
|
|
56
|
+
cluster.cpuArchitecture,
|
|
57
|
+
cluster.openshiftVersion,
|
|
58
|
+
cluster.platform?.type,
|
|
59
|
+
cluster.controlPlaneCount,
|
|
60
|
+
]);
|
|
42
61
|
|
|
43
62
|
const filteredBundles = bundles.filter(
|
|
44
63
|
(bundle) =>
|
|
@@ -75,6 +94,7 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
|
|
|
75
94
|
bundles={filteredBundles}
|
|
76
95
|
preflightRequirements={preflightRequirements}
|
|
77
96
|
searchTerm={searchTerm}
|
|
97
|
+
allBundles={allBundles}
|
|
78
98
|
/>
|
|
79
99
|
</StackItem>
|
|
80
100
|
<StackItem>
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
import BundleAPI from '../../common/api/assisted-service/BundleAPI';
|
|
2
2
|
|
|
3
3
|
const BundleService = {
|
|
4
|
-
async listBundles(
|
|
5
|
-
|
|
4
|
+
async listBundles(
|
|
5
|
+
openshiftVersion?: string,
|
|
6
|
+
cpuArchitecture?: string,
|
|
7
|
+
platformType?: string,
|
|
8
|
+
featureIds?: string,
|
|
9
|
+
) {
|
|
10
|
+
const { data: bundles } = await BundleAPI.list(
|
|
11
|
+
openshiftVersion,
|
|
12
|
+
cpuArchitecture,
|
|
13
|
+
platformType,
|
|
14
|
+
featureIds,
|
|
15
|
+
);
|
|
6
16
|
return bundles;
|
|
7
17
|
},
|
|
8
18
|
async listOperatorsByBundle(bundleName: string) {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.48.
|
|
4
|
-
"@openshift-assisted/types": "2.48.
|
|
3
|
+
"@openshift-assisted/locales": "2.48.2",
|
|
4
|
+
"@openshift-assisted/types": "2.48.2",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "6.2.3",
|
|
7
7
|
"@patternfly/react-code-editor": "6.2.2",
|
|
@@ -140,5 +140,5 @@
|
|
|
140
140
|
]
|
|
141
141
|
}
|
|
142
142
|
},
|
|
143
|
-
"version": "2.48.
|
|
143
|
+
"version": "2.48.2"
|
|
144
144
|
}
|