@openshift-assisted/ui-lib 2.47.5 → 2.48.1
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/wizardTransition.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/wizardTransition.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/InfraEnvOpenShiftVersionDropdown.d.ts.map +1 -1
- 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/common/api/assisted-service/ClustersAPI.d.ts +4 -0
- package/build/@types/common/api/assisted-service/ClustersAPI.d.ts.map +1 -1
- package/build/@types/common/api/assisted-service/HostsAPI.d.ts +2 -1
- package/build/@types/common/api/assisted-service/HostsAPI.d.ts.map +1 -1
- package/build/@types/common/api/assisted-service/InfraEnvsAPI.d.ts +2 -1
- package/build/@types/common/api/assisted-service/InfraEnvsAPI.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/ReviewValidations.d.ts.map +1 -1
- package/build/@types/common/components/operators/operatorDescriptions.d.ts +2 -0
- package/build/@types/common/components/operators/operatorDescriptions.d.ts.map +1 -1
- package/build/@types/common/components/operators/operatorSpecs.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/PullSecretField.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts +8 -0
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/common/config/docs_links.d.ts +2 -0
- package/build/@types/common/config/docs_links.d.ts.map +1 -1
- package/build/@types/common/reducers/alertsSlice.d.ts +1 -0
- package/build/@types/common/reducers/alertsSlice.d.ts.map +1 -1
- package/build/@types/ocm/components/HostsClusterDetailTab/utils.d.ts.map +1 -1
- package/build/@types/ocm/components/Routes.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/operators/utils.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/ClusterWizardContext.d.ts +3 -0
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContext.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardFooter.d.ts +2 -1
- package/build/@types/ocm/components/clusterWizard/ClusterWizardFooter.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/HostDiscovery.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/NewClusterWizard.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/components/clusterWizard/constants.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/BasicStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts +4 -0
- package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterWizard/disconnected/ReviewStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/index.d.ts +1 -0
- package/build/@types/ocm/components/clusterWizard/index.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/wizardTransition.d.ts +2 -2
- package/build/@types/ocm/components/clusterWizard/wizardTransition.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/HostsDiscoveryTable.d.ts +3 -2
- package/build/@types/ocm/components/hosts/HostsDiscoveryTable.d.ts.map +1 -1
- package/build/@types/ocm/hooks/index.d.ts +1 -0
- package/build/@types/ocm/hooks/index.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useInfraEnvHosts.d.ts +9 -0
- package/build/@types/ocm/hooks/useInfraEnvHosts.d.ts.map +1 -0
- package/build/@types/ocm/hooks/useInfraEnvId.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useLateBinding.d.ts +4 -0
- package/build/@types/ocm/hooks/useLateBinding.d.ts.map +1 -0
- package/build/@types/ocm/services/BundleService.d.ts +1 -1
- package/build/@types/ocm/services/BundleService.d.ts.map +1 -1
- package/build/@types/ocm/services/ClustersService.d.ts +5 -1
- package/build/@types/ocm/services/ClustersService.d.ts.map +1 -1
- package/build/@types/ocm/services/HostsService.d.ts +2 -1
- package/build/@types/ocm/services/HostsService.d.ts.map +1 -1
- package/build/@types/ocm/services/InfraEnvsService.d.ts +1 -1
- package/build/@types/ocm/services/InfraEnvsService.d.ts.map +1 -1
- package/build/cjs/cim/components/InfraEnv/InfraEnvOpenShiftVersionDropdown.js +3 -1
- package/build/cjs/cim/components/InfraEnv/InfraEnvOpenShiftVersionDropdown.js.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/common/api/assisted-service/ClustersAPI.js +3 -0
- package/build/cjs/common/api/assisted-service/ClustersAPI.js.map +1 -1
- package/build/cjs/common/api/assisted-service/HostsAPI.js +8 -0
- package/build/cjs/common/api/assisted-service/HostsAPI.js.map +1 -1
- package/build/cjs/common/api/assisted-service/InfraEnvsAPI.js +5 -0
- package/build/cjs/common/api/assisted-service/InfraEnvsAPI.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js +2 -1
- package/build/cjs/common/components/clusterWizard/ReviewValidations.js.map +1 -1
- package/build/cjs/common/components/operators/operatorDescriptions.js +3 -1
- package/build/cjs/common/components/operators/operatorDescriptions.js.map +1 -1
- package/build/cjs/common/components/operators/operatorSpecs.js +24 -1
- package/build/cjs/common/components/operators/operatorSpecs.js.map +1 -1
- package/build/cjs/common/components/ui/WizardFooter.js +1 -1
- package/build/cjs/common/components/ui/WizardFooter.js.map +1 -1
- package/build/cjs/common/components/ui/formik/PullSecretField.js.map +1 -1
- package/build/cjs/common/config/constants.js +14 -2
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/config/docs_links.js +5 -1
- package/build/cjs/common/config/docs_links.js.map +1 -1
- package/build/cjs/common/reducers/alertsSlice.js +1 -1
- package/build/cjs/common/reducers/alertsSlice.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/Routes.js +2 -1
- package/build/cjs/ocm/components/Routes.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/HostInventory.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/HostInventory.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.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/operators/utils.js +7 -4
- package/build/cjs/ocm/components/clusterConfiguration/operators/utils.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 +14 -3
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContext.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js +4 -0
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js +21 -6
- package/build/cjs/ocm/components/clusterWizard/ClusterWizardFooter.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/HostDiscovery.js +3 -0
- package/build/cjs/ocm/components/clusterWizard/HostDiscovery.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js +3 -0
- package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js +9 -14
- 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/components/clusterWizard/constants.js +1 -0
- package/build/cjs/ocm/components/clusterWizard/constants.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js +45 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js +128 -0
- package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js.map +1 -0
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js +40 -5
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/index.js +3 -1
- package/build/cjs/ocm/components/clusterWizard/index.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/wizardTransition.js +3 -0
- package/build/cjs/ocm/components/clusterWizard/wizardTransition.js.map +1 -1
- package/build/cjs/ocm/components/hosts/HostsDiscoveryTable.js +1 -2
- package/build/cjs/ocm/components/hosts/HostsDiscoveryTable.js.map +1 -1
- package/build/cjs/ocm/hooks/index.js +3 -1
- package/build/cjs/ocm/hooks/index.js.map +1 -1
- package/build/cjs/ocm/hooks/useInfraEnvHosts.js +47 -0
- package/build/cjs/ocm/hooks/useInfraEnvHosts.js.map +1 -0
- package/build/cjs/ocm/hooks/useInfraEnvId.js +11 -2
- package/build/cjs/ocm/hooks/useInfraEnvId.js.map +1 -1
- package/build/cjs/ocm/hooks/useLateBinding.js +61 -0
- package/build/cjs/ocm/hooks/useLateBinding.js.map +1 -0
- package/build/cjs/ocm/services/BundleService.js +2 -2
- package/build/cjs/ocm/services/BundleService.js.map +1 -1
- package/build/cjs/ocm/services/ClustersService.js +10 -2
- package/build/cjs/ocm/services/ClustersService.js.map +1 -1
- package/build/cjs/ocm/services/HostsService.js +6 -0
- package/build/cjs/ocm/services/HostsService.js.map +1 -1
- package/build/cjs/ocm/services/InfraEnvsService.js +2 -2
- package/build/cjs/ocm/services/InfraEnvsService.js.map +1 -1
- package/lib/cim/components/InfraEnv/InfraEnvOpenShiftVersionDropdown.tsx +11 -9
- package/lib/common/api/assisted-service/BundleAPI.ts +15 -2
- package/lib/common/api/assisted-service/ClustersAPI.ts +6 -0
- package/lib/common/api/assisted-service/HostsAPI.ts +13 -0
- package/lib/common/api/assisted-service/InfraEnvsAPI.ts +6 -0
- package/lib/common/components/clusterWizard/ReviewValidations.tsx +4 -1
- package/lib/common/components/operators/operatorDescriptions.tsx +6 -0
- package/lib/common/components/operators/operatorSpecs.tsx +34 -1
- package/lib/common/components/ui/WizardFooter.tsx +1 -1
- package/lib/common/components/ui/formik/PullSecretField.tsx +1 -0
- package/lib/common/config/constants.ts +12 -0
- package/lib/common/config/docs_links.ts +10 -0
- package/lib/common/reducers/alertsSlice.ts +2 -1
- package/lib/ocm/components/HostsClusterDetailTab/utils.ts +30 -14
- package/lib/ocm/components/Routes.tsx +3 -1
- package/lib/ocm/components/clusterConfiguration/HostInventory.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx +0 -3
- package/lib/ocm/components/clusterConfiguration/operators/utils.tsx +9 -5
- 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 +23 -5
- package/lib/ocm/components/clusterWizard/ClusterWizardContext.tsx +3 -0
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +6 -0
- package/lib/ocm/components/clusterWizard/ClusterWizardFooter.tsx +26 -5
- package/lib/ocm/components/clusterWizard/HostDiscovery.tsx +3 -0
- package/lib/ocm/components/clusterWizard/NewClusterWizard.tsx +3 -0
- package/lib/ocm/components/clusterWizard/OperatorsBundle.tsx +6 -9
- package/lib/ocm/components/clusterWizard/OperatorsStep.tsx +22 -2
- package/lib/ocm/components/clusterWizard/constants.ts +1 -0
- package/lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx +52 -1
- package/lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx +200 -0
- package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx +39 -7
- package/lib/ocm/components/clusterWizard/index.ts +1 -0
- package/lib/ocm/components/clusterWizard/wizardTransition.ts +5 -1
- package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx +3 -2
- package/lib/ocm/hooks/index.ts +1 -0
- package/lib/ocm/hooks/useInfraEnvHosts.ts +60 -0
- package/lib/ocm/hooks/useInfraEnvId.ts +15 -2
- package/lib/ocm/hooks/useLateBinding.ts +71 -0
- package/lib/ocm/services/BundleService.ts +12 -2
- package/lib/ocm/services/ClustersService.ts +14 -2
- package/lib/ocm/services/HostsService.ts +9 -0
- package/lib/ocm/services/InfraEnvsService.ts +4 -1
- package/package.json +3 -3
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.useFeatureDetection = exports.useInfraEnv = exports.useUISettings = exports.useClusterPreflightRequirements = exports.usePullSecret = exports.useInfraEnvId = exports.useUsedClusterNames = exports.useManagedDomains = void 0;
|
|
6
|
+
exports.useFeatureDetection = exports.useInfraEnvHosts = exports.useInfraEnv = exports.useUISettings = exports.useClusterPreflightRequirements = exports.usePullSecret = exports.useInfraEnvId = exports.useUsedClusterNames = exports.useManagedDomains = void 0;
|
|
7
7
|
var useManagedDomains_1 = require("./useManagedDomains");
|
|
8
8
|
Object.defineProperty(exports, "useManagedDomains", { enumerable: true, get: function () { return __importDefault(useManagedDomains_1).default; } });
|
|
9
9
|
var useUsedClusterNames_1 = require("./useUsedClusterNames");
|
|
@@ -18,6 +18,8 @@ var useUISettings_1 = require("./useUISettings");
|
|
|
18
18
|
Object.defineProperty(exports, "useUISettings", { enumerable: true, get: function () { return __importDefault(useUISettings_1).default; } });
|
|
19
19
|
var useInfraEnv_1 = require("./useInfraEnv");
|
|
20
20
|
Object.defineProperty(exports, "useInfraEnv", { enumerable: true, get: function () { return __importDefault(useInfraEnv_1).default; } });
|
|
21
|
+
var useInfraEnvHosts_1 = require("./useInfraEnvHosts");
|
|
22
|
+
Object.defineProperty(exports, "useInfraEnvHosts", { enumerable: true, get: function () { return __importDefault(useInfraEnvHosts_1).default; } });
|
|
21
23
|
var use_feature_detection_1 = require("./use-feature-detection");
|
|
22
24
|
Object.defineProperty(exports, "useFeatureDetection", { enumerable: true, get: function () { return use_feature_detection_1.useFeatureDetection; } });
|
|
23
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
|
+
const useInfraEnvId_1 = tslib_1.__importDefault(require("./useInfraEnvId"));
|
|
6
|
+
const common_1 = require("../../common");
|
|
7
|
+
const utils_1 = require("../../common/utils");
|
|
8
|
+
const apis_1 = require("../services/apis");
|
|
9
|
+
const InfraEnvIdsCacheService_1 = tslib_1.__importDefault(require("../services/InfraEnvIdsCacheService"));
|
|
10
|
+
const useInfraEnvHosts = (clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) => {
|
|
11
|
+
const [hosts, setHosts] = react_1.default.useState();
|
|
12
|
+
const [error, setError] = react_1.default.useState('');
|
|
13
|
+
const { infraEnvId, error: infraEnvIdError } = (0, useInfraEnvId_1.default)(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion);
|
|
14
|
+
const getHosts = react_1.default.useCallback(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
+
try {
|
|
16
|
+
if (infraEnvId) {
|
|
17
|
+
const { data: hostsData } = yield apis_1.InfraEnvsAPI.getHosts(infraEnvId);
|
|
18
|
+
setHosts(hostsData);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
catch (e) {
|
|
22
|
+
// Invalidate this cluster's cached data
|
|
23
|
+
InfraEnvIdsCacheService_1.default.removeInfraEnvId(clusterId, cpuArchitecture);
|
|
24
|
+
setError((0, utils_1.getErrorMessage)(e));
|
|
25
|
+
}
|
|
26
|
+
}), [clusterId, cpuArchitecture, infraEnvId]);
|
|
27
|
+
react_1.default.useEffect(() => {
|
|
28
|
+
if (infraEnvIdError) {
|
|
29
|
+
setHosts(undefined);
|
|
30
|
+
setError(infraEnvIdError);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
if (infraEnvId) {
|
|
34
|
+
// Initial fetch
|
|
35
|
+
void getHosts();
|
|
36
|
+
// Set up polling to refetch hosts periodically
|
|
37
|
+
const intervalId = setInterval(() => {
|
|
38
|
+
void getHosts();
|
|
39
|
+
}, common_1.DEFAULT_POLLING_INTERVAL);
|
|
40
|
+
return () => clearInterval(intervalId);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}, [getHosts, infraEnvId, infraEnvIdError]);
|
|
44
|
+
return { hosts, error, isLoading: !hosts && !error };
|
|
45
|
+
};
|
|
46
|
+
exports.default = useInfraEnvHosts;
|
|
47
|
+
//# sourceMappingURL=useInfraEnvHosts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useInfraEnvHosts.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvHosts.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,4EAA4C;AAC5C,yCAAyE;AACzE,8CAAqD;AACrD,2CAAgD;AAChD,0GAA0E;AAG1E,MAAM,gBAAgB,GAAG,CACvB,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB,EACzB,EAAE;IACF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAA,uBAAa,EAC1D,SAAS,EACT,eAAe,EACf,WAAW,EACX,UAAU,EACV,gBAAgB,CACjB,CAAC;IAEF,MAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC5C,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACpE,QAAQ,CAAC,SAAS,CAAC,CAAC;aACrB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,iCAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACrE,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC;IAE7C,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,QAAQ,CAAC,eAAe,CAAC,CAAC;SAC3B;aAAM;YACL,IAAI,UAAU,EAAE;gBACd,gBAAgB;gBAChB,KAAK,QAAQ,EAAE,CAAC;gBAEhB,+CAA+C;gBAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;oBAClC,KAAK,QAAQ,EAAE,CAAC;gBAClB,CAAC,EAAE,iCAAwB,CAAC,CAAC;gBAE7B,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;aACxC;SACF;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;AACvD,CAAC,CAAC;AACF,kBAAe,gBAAgB,CAAC"}
|
|
@@ -4,12 +4,14 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
5
|
const utils_1 = require("../../common/utils");
|
|
6
6
|
const services_1 = require("../services");
|
|
7
|
+
const use_feature_1 = require("./use-feature");
|
|
7
8
|
function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) {
|
|
8
9
|
const [infraEnvId, setInfraEnv] = react_1.default.useState();
|
|
9
10
|
const [error, setError] = react_1.default.useState('');
|
|
11
|
+
const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
10
12
|
const findInfraEnvId = react_1.default.useCallback(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
13
|
try {
|
|
12
|
-
const infraEnvId = yield services_1.InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
|
|
14
|
+
const infraEnvId = yield services_1.InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture, isSingleClusterFeatureEnabled);
|
|
13
15
|
if (infraEnvId && !(infraEnvId instanceof Error)) {
|
|
14
16
|
setInfraEnv(infraEnvId);
|
|
15
17
|
}
|
|
@@ -30,7 +32,14 @@ function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, open
|
|
|
30
32
|
catch (e) {
|
|
31
33
|
setError((0, utils_1.getErrorMessage)(e));
|
|
32
34
|
}
|
|
33
|
-
}), [
|
|
35
|
+
}), [
|
|
36
|
+
clusterId,
|
|
37
|
+
cpuArchitecture,
|
|
38
|
+
isSingleClusterFeatureEnabled,
|
|
39
|
+
pullSecret,
|
|
40
|
+
clusterName,
|
|
41
|
+
openshiftVersion,
|
|
42
|
+
]);
|
|
34
43
|
react_1.default.useEffect(() => {
|
|
35
44
|
if (!clusterId) {
|
|
36
45
|
setError('Missing clusterId to load infrastructure environment');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;
|
|
1
|
+
{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;AAM/C,+CAA2C;AAE3C,SAAwB,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,2BAAgB,CAAC,aAAa,CACrD,SAAS,EACT,eAAe,EACf,6BAA6B,CAC9B,CAAC;YACF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE;gBAChD,WAAW,CAAC,UAAU,CAAC,CAAC;aACzB;iBAAM;gBACL,4CAA4C;gBAC5C,IAAI,UAAU,EAAE;oBACd,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,2BAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS;wBACT,gBAAgB;wBAChB,eAAe,EAAE,eAA0D;qBAC5E,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC1B;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE;QACD,SAAS;QACT,eAAe;QACf,6BAA6B;QAC7B,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC,CAAC;IAEH,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,EAAE;YACd,QAAQ,CAAC,sDAAsD,CAAC,CAAC;SAClE;aAAM,IAAI,CAAC,UAAU,EAAE;YACtB,KAAK,cAAc,EAAE,CAAC;SACvB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC;AAtDD,gCAsDC"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const common_1 = require("../../common");
|
|
6
|
+
const useInfraEnvHosts_1 = tslib_1.__importDefault(require("./useInfraEnvHosts"));
|
|
7
|
+
const HostsService_1 = tslib_1.__importDefault(require("../services/HostsService"));
|
|
8
|
+
const utils_1 = require("../../common/utils");
|
|
9
|
+
const use_feature_1 = require("./use-feature");
|
|
10
|
+
const useLateBinding = (cluster) => {
|
|
11
|
+
const [isBinding, setIsBinding] = (0, react_1.useState)(false);
|
|
12
|
+
const { addAlert, removeAlert, alerts } = (0, common_1.useAlerts)();
|
|
13
|
+
const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
14
|
+
const { hosts: infraEnvHosts, error: infraEnvError, isLoading: infraEnvLoading, } = (0, useInfraEnvHosts_1.default)(isSingleClusterFeatureEnabled ? cluster.id : '', cluster.cpuArchitecture
|
|
15
|
+
? cluster.cpuArchitecture
|
|
16
|
+
: common_1.CpuArchitecture.USE_DAY1_ARCHITECTURE, cluster.name, undefined, cluster.openshiftVersion);
|
|
17
|
+
const bindHosts = (0, react_1.useCallback)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
18
|
+
var _a;
|
|
19
|
+
if (infraEnvHosts && !infraEnvError && !infraEnvLoading && isSingleClusterFeatureEnabled) {
|
|
20
|
+
for (const host of infraEnvHosts) {
|
|
21
|
+
if (host.clusterId !== cluster.id) {
|
|
22
|
+
setIsBinding(true);
|
|
23
|
+
try {
|
|
24
|
+
const alertKey = (_a = alerts.find((alert) => alert.key === host.id)) === null || _a === void 0 ? void 0 : _a.key;
|
|
25
|
+
if (alertKey) {
|
|
26
|
+
removeAlert(alertKey);
|
|
27
|
+
}
|
|
28
|
+
yield HostsService_1.default.bind(host, cluster.id);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
addAlert({
|
|
32
|
+
title: `Failed to bind host ${host.requestedHostname || ''}`,
|
|
33
|
+
message: (0, utils_1.getErrorMessage)(error),
|
|
34
|
+
key: host.id,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
finally {
|
|
38
|
+
setIsBinding(false);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
44
|
+
}), [
|
|
45
|
+
infraEnvHosts,
|
|
46
|
+
infraEnvError,
|
|
47
|
+
infraEnvLoading,
|
|
48
|
+
isSingleClusterFeatureEnabled,
|
|
49
|
+
cluster.id,
|
|
50
|
+
addAlert,
|
|
51
|
+
removeAlert,
|
|
52
|
+
]);
|
|
53
|
+
(0, react_1.useEffect)(() => {
|
|
54
|
+
if (isSingleClusterFeatureEnabled) {
|
|
55
|
+
void bindHosts();
|
|
56
|
+
}
|
|
57
|
+
}, [isSingleClusterFeatureEnabled, bindHosts]);
|
|
58
|
+
return infraEnvLoading || isBinding;
|
|
59
|
+
};
|
|
60
|
+
exports.default = useLateBinding;
|
|
61
|
+
//# sourceMappingURL=useLateBinding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useLateBinding.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useLateBinding.ts"],"names":[],"mappings":";;;AAAA,iCAAyD;AAEzD,yCAA0D;AAC1D,kFAAkD;AAClD,oFAAoD;AACpD,8CAAqD;AACrD,+CAA2C;AAE3C,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAW,EAAE;IACnD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IACtD,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,EACJ,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,eAAe,GAC3B,GAAG,IAAA,0BAAgB,EAClB,6BAA6B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAC/C,OAAO,CAAC,eAAe;QACrB,CAAC,CAAE,OAAO,CAAC,eAAmC;QAC9C,CAAC,CAAC,wBAAe,CAAC,qBAAqB,EACzC,OAAO,CAAC,IAAI,EACZ,SAAS,EACT,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAS,EAAE;;QACvC,IAAI,aAAa,IAAI,CAAC,aAAa,IAAI,CAAC,eAAe,IAAI,6BAA6B,EAAE;YACxF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAChC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE,EAAE;oBACjC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACnB,IAAI;wBACF,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,0CAAE,GAAG,CAAC;wBACpE,IAAI,QAAQ,EAAE;4BACZ,WAAW,CAAC,QAAQ,CAAC,CAAC;yBACvB;wBACD,MAAM,sBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;qBAC3C;oBAAC,OAAO,KAAK,EAAE;wBACd,QAAQ,CAAC;4BACP,KAAK,EAAE,uBAAuB,IAAI,CAAC,iBAAiB,IAAI,EAAE,EAAE;4BAC5D,OAAO,EAAE,IAAA,uBAAe,EAAC,KAAK,CAAC;4BAC/B,GAAG,EAAE,IAAI,CAAC,EAAE;yBACb,CAAC,CAAC;qBACJ;4BAAS;wBACR,YAAY,CAAC,KAAK,CAAC,CAAC;qBACrB;iBACF;aACF;SACF;QACD,uDAAuD;IACzD,CAAC,CAAA,EAAE;QACD,aAAa;QACb,aAAa;QACb,eAAe;QACf,6BAA6B;QAC7B,OAAO,CAAC,EAAE;QACV,QAAQ;QACR,WAAW;KACZ,CAAC,CAAC;IAEH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,6BAA6B,EAAE;YACjC,KAAK,SAAS,EAAE,CAAC;SAClB;IACH,CAAC,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/C,OAAO,eAAe,IAAI,SAAS,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
|
|
@@ -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"}
|
|
@@ -11,7 +11,7 @@ const ClustersService = {
|
|
|
11
11
|
findHost(hosts = [], hostId) {
|
|
12
12
|
return hosts.find((host) => host.id === hostId);
|
|
13
13
|
},
|
|
14
|
-
create(params, isAssistedMigration) {
|
|
14
|
+
create(params, isAssistedMigration, isSingleClusterFeatureEnabled) {
|
|
15
15
|
var _a, _b;
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
if (isAssistedMigration) {
|
|
@@ -29,7 +29,9 @@ const ClustersService = {
|
|
|
29
29
|
if (((_a = params.platform) === null || _a === void 0 ? void 0 : _a.type) === 'external' && ((_b = params.platform.external) === null || _b === void 0 ? void 0 : _b.platformName) === 'oci') {
|
|
30
30
|
infraEnvCreateParams.imageType = 'minimal-iso';
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
if (!isSingleClusterFeatureEnabled) {
|
|
33
|
+
yield InfraEnvsService_1.default.create(infraEnvCreateParams);
|
|
34
|
+
}
|
|
33
35
|
return cluster;
|
|
34
36
|
});
|
|
35
37
|
},
|
|
@@ -126,6 +128,12 @@ const ClustersService = {
|
|
|
126
128
|
updateCustomManifest(existingManifest, updatedManifest, clusterId) {
|
|
127
129
|
return ClustersAPI_1.default.updateCustomManifest(clusterId, this.getUpdateManifestParams(existingManifest, updatedManifest));
|
|
128
130
|
},
|
|
131
|
+
registerDisconnected(params) {
|
|
132
|
+
return ClustersAPI_1.default.registerDisconnected({
|
|
133
|
+
name: params.name,
|
|
134
|
+
openshiftVersion: params.openshiftVersion,
|
|
135
|
+
});
|
|
136
|
+
},
|
|
129
137
|
};
|
|
130
138
|
exports.default = ClustersService;
|
|
131
139
|
//# sourceMappingURL=ClustersService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":";;;AAYA,wEAAqC;AACrC,wGAAwE;AACxE,0EAA0C;AAC1C,kFAAkD;AAClD,6DAIuC;AACvC,8DAAuD;AAEvD,MAAM,eAAe,GAAG;IACtB,QAAQ,CAAC,QAA0B,EAAE,EAAE,MAAkB;QACvD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IAClD,CAAC;IAEK,MAAM,
|
|
1
|
+
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,12 @@ const HostsService = {
|
|
|
63
63
|
}
|
|
64
64
|
return apis_1.HostsAPI.installHost(host.infraEnvId, host.id);
|
|
65
65
|
},
|
|
66
|
+
bind(host, clusterId) {
|
|
67
|
+
if (!host.infraEnvId) {
|
|
68
|
+
throw new Error(`Cannot bind host ${host.id}, missing infraEnvId`);
|
|
69
|
+
}
|
|
70
|
+
return apis_1.HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
|
|
71
|
+
},
|
|
66
72
|
installAll(hosts) {
|
|
67
73
|
const promises = [];
|
|
68
74
|
for (const host of hosts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ const apis_1 = require("./apis");
|
|
|
5
5
|
const InfraEnvIdsCacheService_1 = tslib_1.__importDefault(require("./InfraEnvIdsCacheService"));
|
|
6
6
|
const dummyData_1 = require("../components/clusterConfiguration/staticIp/data/dummyData");
|
|
7
7
|
const InfraEnvsService = {
|
|
8
|
-
getInfraEnvId(clusterId, cpuArchitecture) {
|
|
8
|
+
getInfraEnvId(clusterId, cpuArchitecture, isSingleClusterFeatureEnabled) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
let infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);
|
|
11
11
|
if (infraEnvId instanceof Error) {
|
|
12
|
-
const { data: infraEnvs } = yield apis_1.InfraEnvsAPI.list(clusterId);
|
|
12
|
+
const { data: infraEnvs } = yield apis_1.InfraEnvsAPI.list(!isSingleClusterFeatureEnabled ? clusterId : '');
|
|
13
13
|
if (infraEnvs.length > 0) {
|
|
14
14
|
InfraEnvIdsCacheService_1.default.updateInfraEnvs(clusterId, infraEnvs);
|
|
15
15
|
infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":";;;AAEA,iCAAsC;AACtC,gGAAsD;AACtD,0FAAmG;AAQnG,MAAM,gBAAgB,GAAG;IACjB,aAAa,CACjB,SAAwB,EACxB,eAAgC;;
|
|
1
|
+
{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,15 +65,17 @@ const InfraEnvOpenShiftVersionDropdown = ({ osImages }: { osImages: OsImage[] })
|
|
|
65
65
|
onOpenChange={() => setOsImageOpen(!osImageOpen)}
|
|
66
66
|
>
|
|
67
67
|
<DropdownList>
|
|
68
|
-
{filteredImages
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
68
|
+
{filteredImages
|
|
69
|
+
.sort((a, b) => b.openshiftVersion.localeCompare(a.openshiftVersion))
|
|
70
|
+
.map((image) => (
|
|
71
|
+
<DropdownItem
|
|
72
|
+
key={image.openshiftVersion}
|
|
73
|
+
id={image.openshiftVersion}
|
|
74
|
+
value={image.openshiftVersion}
|
|
75
|
+
>
|
|
76
|
+
{`OpenShift ${image.openshiftVersion}`}
|
|
77
|
+
</DropdownItem>
|
|
78
|
+
))}
|
|
77
79
|
</DropdownList>
|
|
78
80
|
</Dropdown>
|
|
79
81
|
</Tooltip>
|
|
@@ -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) {
|
|
@@ -245,6 +245,12 @@ const ClustersAPI = {
|
|
|
245
245
|
headers: { 'Content-Type': 'application/json' },
|
|
246
246
|
});
|
|
247
247
|
},
|
|
248
|
+
registerDisconnected(params: { name: string; openshiftVersion: string }) {
|
|
249
|
+
return client.post<Cluster, AxiosResponse<Cluster>, { name: string; openshiftVersion: string }>(
|
|
250
|
+
`${ClustersAPI.makeBaseURI()}disconnected`,
|
|
251
|
+
params,
|
|
252
|
+
);
|
|
253
|
+
},
|
|
248
254
|
};
|
|
249
255
|
|
|
250
256
|
export default ClustersAPI;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
Cluster,
|
|
2
3
|
Host,
|
|
3
4
|
HostUpdateParams,
|
|
4
5
|
InfraEnv,
|
|
@@ -62,6 +63,18 @@ const HostsAPI = {
|
|
|
62
63
|
`${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/install`,
|
|
63
64
|
);
|
|
64
65
|
},
|
|
66
|
+
bindHost(infraEnvId: InfraEnv['id'], hostId: Host['id'], clusterId: Cluster['id']) {
|
|
67
|
+
return client.post<Host, AxiosResponse<Host>, { cluster_id: string }>(
|
|
68
|
+
`${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/bind`,
|
|
69
|
+
{ cluster_id: clusterId },
|
|
70
|
+
{
|
|
71
|
+
headers: {
|
|
72
|
+
accept: 'application/json',
|
|
73
|
+
'Content-Type': 'application/json',
|
|
74
|
+
},
|
|
75
|
+
},
|
|
76
|
+
);
|
|
77
|
+
},
|
|
65
78
|
};
|
|
66
79
|
|
|
67
80
|
export default HostsAPI;
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
InfraEnvCreateParams,
|
|
5
5
|
PresignedUrl,
|
|
6
6
|
InfraEnvUpdateParams,
|
|
7
|
+
Host,
|
|
7
8
|
} from '@openshift-assisted/types/assisted-installer-service';
|
|
8
9
|
import { AxiosResponse } from 'axios';
|
|
9
10
|
|
|
@@ -67,6 +68,11 @@ const InfraEnvsAPI = {
|
|
|
67
68
|
`${InfraEnvsAPI.makeBaseURI(infraEnvId)}/downloads/files-presigned?file_name=ipxe-script`,
|
|
68
69
|
);
|
|
69
70
|
},
|
|
71
|
+
getHosts(infraEnvId: InfraEnv['id']) {
|
|
72
|
+
return client.get<Host[]>(`${InfraEnvsAPI.makeBaseURI(infraEnvId)}/hosts`, {
|
|
73
|
+
signal: _getRequestAbortController.signal,
|
|
74
|
+
});
|
|
75
|
+
},
|
|
70
76
|
};
|
|
71
77
|
|
|
72
78
|
export default InfraEnvsAPI;
|
|
@@ -108,7 +108,10 @@ const FailingValidation = <S extends string>({
|
|
|
108
108
|
</>
|
|
109
109
|
);
|
|
110
110
|
} else {
|
|
111
|
-
if (
|
|
111
|
+
if (
|
|
112
|
+
validation.id === 'platform-requirements-satisfied' ||
|
|
113
|
+
validation.id === 'openshift-ai-gpu-requirements-satisfied'
|
|
114
|
+
) {
|
|
112
115
|
fix = validation.message;
|
|
113
116
|
}
|
|
114
117
|
// console.error(
|
|
@@ -60,6 +60,12 @@ export const DESCRIPTION_LVM =
|
|
|
60
60
|
export const DESCRIPTION_CLUSTER_OBSERVABILITY =
|
|
61
61
|
'Provides observability and monitoring capabilities for your OpenShift cluster.';
|
|
62
62
|
|
|
63
|
+
export const DESCRIPTION_LOKI =
|
|
64
|
+
'Provides a log aggregation system designed to store and query logs from all applications and infrastructure components.';
|
|
65
|
+
|
|
66
|
+
export const DESCRIPTION_OPENSHIFT_LOGGING =
|
|
67
|
+
'Collects, stores, and visualizes logs from OpenShift Container Platform components and applications.';
|
|
68
|
+
|
|
63
69
|
export const DESCRIPTION_NUMA_RESOURCES =
|
|
64
70
|
'Provides NUMA-aware scheduling to improve workload performance on NUMA systems.';
|
|
65
71
|
|
|
@@ -24,6 +24,8 @@ import {
|
|
|
24
24
|
OPERATOR_NAME_NODE_MAINTENANCE,
|
|
25
25
|
OPERATOR_NAME_KUBE_DESCHEDULER,
|
|
26
26
|
OPERATOR_NAME_CLUSTER_OBSERVABILITY,
|
|
27
|
+
OPERATOR_NAME_LOKI,
|
|
28
|
+
OPERATOR_NAME_OPENSHIFT_LOGGING,
|
|
27
29
|
OPERATOR_NAME_NUMA_RESOURCES,
|
|
28
30
|
OPERATOR_NAME_OADP,
|
|
29
31
|
OPERATOR_NAME_METALLB,
|
|
@@ -36,6 +38,7 @@ import {
|
|
|
36
38
|
getClusterObservabilityLink,
|
|
37
39
|
getKmmDocsLink,
|
|
38
40
|
getKubeDeschedulerLink,
|
|
41
|
+
getLokiLink,
|
|
39
42
|
getLsoLink,
|
|
40
43
|
getLvmsDocsLink,
|
|
41
44
|
getMceDocsLink,
|
|
@@ -45,6 +48,7 @@ import {
|
|
|
45
48
|
getNumaResourcesLink,
|
|
46
49
|
getNvidiaGpuLink,
|
|
47
50
|
getOadpLink,
|
|
51
|
+
getOpenShiftLoggingLink,
|
|
48
52
|
MTV_LINK,
|
|
49
53
|
NODE_HEALTHCHECK_LINK,
|
|
50
54
|
NODE_MAINTENANCE_LINK,
|
|
@@ -83,6 +87,8 @@ import {
|
|
|
83
87
|
DESCRIPTION_SERVICEMESH,
|
|
84
88
|
DESCRIPTION_LVM,
|
|
85
89
|
DESCRIPTION_CLUSTER_OBSERVABILITY,
|
|
90
|
+
DESCRIPTION_LOKI,
|
|
91
|
+
DESCRIPTION_OPENSHIFT_LOGGING,
|
|
86
92
|
DESCRIPTION_NUMA_RESOURCES,
|
|
87
93
|
DESCRIPTION_OADP,
|
|
88
94
|
DESCRIPTION_METALLB,
|
|
@@ -473,9 +479,36 @@ export const getOperatorSpecs = (
|
|
|
473
479
|
</ExternalLink>
|
|
474
480
|
</>
|
|
475
481
|
),
|
|
476
|
-
notStandalone: true,
|
|
477
482
|
supportLevel: getFeatureSupportLevel('CLUSTER_OBSERVABILITY'),
|
|
478
483
|
},
|
|
484
|
+
{
|
|
485
|
+
operatorKey: OPERATOR_NAME_LOKI,
|
|
486
|
+
title: 'Loki Operator',
|
|
487
|
+
featureId: 'CLUSTER_OBSERVABILITY',
|
|
488
|
+
descriptionText: DESCRIPTION_LOKI,
|
|
489
|
+
Description: ({ openshiftVersion, searchTerm }) => (
|
|
490
|
+
<>
|
|
491
|
+
<HighlightedText text={DESCRIPTION_LOKI} searchTerm={searchTerm} />{' '}
|
|
492
|
+
<ExternalLink href={getLokiLink(openshiftVersion)}>Learn more</ExternalLink>
|
|
493
|
+
</>
|
|
494
|
+
),
|
|
495
|
+
notStandalone: true,
|
|
496
|
+
supportLevel: getFeatureSupportLevel('LOKI'),
|
|
497
|
+
},
|
|
498
|
+
{
|
|
499
|
+
operatorKey: OPERATOR_NAME_OPENSHIFT_LOGGING,
|
|
500
|
+
title: 'OpenShift Logging',
|
|
501
|
+
featureId: 'CLUSTER_OBSERVABILITY',
|
|
502
|
+
descriptionText: DESCRIPTION_OPENSHIFT_LOGGING,
|
|
503
|
+
Description: ({ openshiftVersion, searchTerm }) => (
|
|
504
|
+
<>
|
|
505
|
+
<HighlightedText text={DESCRIPTION_OPENSHIFT_LOGGING} searchTerm={searchTerm} />{' '}
|
|
506
|
+
<ExternalLink href={getOpenShiftLoggingLink(openshiftVersion)}>Learn more</ExternalLink>
|
|
507
|
+
</>
|
|
508
|
+
),
|
|
509
|
+
notStandalone: true,
|
|
510
|
+
supportLevel: getFeatureSupportLevel('OPENSHIFT_LOGGING'),
|
|
511
|
+
},
|
|
479
512
|
],
|
|
480
513
|
[categories[Category.SCHEDULING]]: [
|
|
481
514
|
{
|
|
@@ -69,7 +69,7 @@ export const WizardFooter: React.FC<WizardFooterProps> = ({
|
|
|
69
69
|
variant={ButtonVariant.primary}
|
|
70
70
|
name="next"
|
|
71
71
|
onClick={onNext}
|
|
72
|
-
isDisabled={isNextDisabled}
|
|
72
|
+
isDisabled={isNextDisabled || isSubmitting}
|
|
73
73
|
isLoading={isNextButtonLoading}
|
|
74
74
|
>
|
|
75
75
|
{nextButtonText || t('ai:Next')}
|
|
@@ -145,6 +145,8 @@ export const hostValidationLabels = (t: TFunction): { [key in HostValidationId]:
|
|
|
145
145
|
'node-maintenance-requirements-satisfied': t('ai:Node Maintenance requirements'),
|
|
146
146
|
'kube-descheduler-requirements-satisfied': t('ai:Kube Descheduler requirements'),
|
|
147
147
|
'cluster-observability-requirements-satisfied': t('ai:Cluster Observability requirements'),
|
|
148
|
+
'loki-requirements-satisfied': t('ai:Loki Operator requirements'),
|
|
149
|
+
'openshift-logging-requirements-satisfied': t('ai:OpenShift Logging Operator requirements'),
|
|
148
150
|
'numa-resources-requirements-satisfied': t('ai:NUMA Resources requirements'),
|
|
149
151
|
'oadp-requirements-satisfied': t('ai:OADP requirements'),
|
|
150
152
|
'metallb-requirements-satisfied': t('ai:MetalLB requirements'),
|
|
@@ -216,6 +218,8 @@ export const hostValidationFailureHints = (
|
|
|
216
218
|
'node-maintenance-requirements-satisfied': '',
|
|
217
219
|
'kube-descheduler-requirements-satisfied': '',
|
|
218
220
|
'cluster-observability-requirements-satisfied': '',
|
|
221
|
+
'loki-requirements-satisfied': '',
|
|
222
|
+
'openshift-logging-requirements-satisfied': '',
|
|
219
223
|
'numa-resources-requirements-satisfied': '',
|
|
220
224
|
'oadp-requirements-satisfied': '',
|
|
221
225
|
'metallb-requirements-satisfied': '',
|
|
@@ -247,8 +251,11 @@ export const clusterValidationLabels = (
|
|
|
247
251
|
'lvm-requirements-satisfied': t('ai:Logical Volume Manager requirements'),
|
|
248
252
|
'cnv-requirements-satisfied': t('ai:CNV requirements'),
|
|
249
253
|
'mce-requirements-satisfied': t('ai:MCE requirements'),
|
|
254
|
+
'openshift-ai-gpu-requirements-satisfied': t('ai:OpenShift AI GPU requirements'),
|
|
250
255
|
'platform-requirements-satisfied': t('ai:Platform requirements'),
|
|
251
256
|
'cluster-observability-requirements-satisfied': t('ai:Cluster Observability requirements'),
|
|
257
|
+
'loki-requirements-satisfied': t('ai:Loki Operator requirements'),
|
|
258
|
+
'openshift-logging-requirements-satisfied': t('ai:OpenShift Logging Operator requirements'),
|
|
252
259
|
'numa-resources-requirements-satisfied': t('ai:NUMA Resources requirements'),
|
|
253
260
|
'oadp-requirements-satisfied': t('ai:OADP requirements'),
|
|
254
261
|
'metallb-requirements-satisfied': t('ai:MetalLB requirements'),
|
|
@@ -333,6 +340,8 @@ export const OPERATOR_NAME_FENCE_AGENTS_REMEDIATION = 'fence-agents-remediation'
|
|
|
333
340
|
export const OPERATOR_NAME_NODE_MAINTENANCE = 'node-maintenance';
|
|
334
341
|
export const OPERATOR_NAME_KUBE_DESCHEDULER = 'kube-descheduler';
|
|
335
342
|
export const OPERATOR_NAME_CLUSTER_OBSERVABILITY = 'cluster-observability';
|
|
343
|
+
export const OPERATOR_NAME_LOKI = 'loki';
|
|
344
|
+
export const OPERATOR_NAME_OPENSHIFT_LOGGING = 'openshift-logging';
|
|
336
345
|
export const OPERATOR_NAME_NUMA_RESOURCES = 'numaresources';
|
|
337
346
|
export const OPERATOR_NAME_OADP = 'oadp';
|
|
338
347
|
export const OPERATOR_NAME_METALLB = 'metallb';
|
|
@@ -345,6 +354,9 @@ export const singleClusterOperators = [
|
|
|
345
354
|
OPERATOR_NAME_NODE_MAINTENANCE,
|
|
346
355
|
OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
|
|
347
356
|
OPERATOR_NAME_KUBE_DESCHEDULER,
|
|
357
|
+
OPERATOR_NAME_CLUSTER_OBSERVABILITY,
|
|
358
|
+
OPERATOR_NAME_LOKI,
|
|
359
|
+
OPERATOR_NAME_OPENSHIFT_LOGGING,
|
|
348
360
|
];
|
|
349
361
|
|
|
350
362
|
export const singleClusterBundles = ['virtualization'];
|
|
@@ -220,6 +220,16 @@ export const getClusterObservabilityLink = (ocpVersion?: string) =>
|
|
|
220
220
|
ocpVersion,
|
|
221
221
|
)}/html/cluster_observability_operator/cluster-observability-operator-overview`;
|
|
222
222
|
|
|
223
|
+
export const getLokiLink = (ocpVersion?: string) =>
|
|
224
|
+
`https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
|
|
225
|
+
ocpVersion,
|
|
226
|
+
)}/html/network_observability/network-observability-overview`;
|
|
227
|
+
|
|
228
|
+
export const getOpenShiftLoggingLink = (ocpVersion?: string) =>
|
|
229
|
+
`https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
|
|
230
|
+
ocpVersion,
|
|
231
|
+
)}/html/logging`;
|
|
232
|
+
|
|
223
233
|
export const getNumaResourcesLink = (ocpVersion?: string) =>
|
|
224
234
|
`https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
|
|
225
235
|
ocpVersion,
|