@openshift-assisted/ui-lib 2.8.2-cim → 2.9.0-cim
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/validationSchemas.d.ts.map +1 -1
- package/@types/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.d.ts +0 -1
- package/@types/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.d.ts.map +1 -1
- package/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts.map +1 -1
- package/@types/cim/components/modals/AddHostModal.d.ts.map +1 -1
- package/@types/cim/components/modals/EditProxyModal.d.ts.map +1 -1
- package/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts +1 -0
- package/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts.map +1 -1
- package/@types/common/components/clusterWizard/ClusterWizardStep.d.ts +1 -1
- package/@types/common/components/clusterWizard/ClusterWizardStep.d.ts.map +1 -1
- package/@types/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.d.ts.map +1 -1
- package/@types/common/components/fetching/EventListFetch.d.ts.map +1 -1
- package/@types/common/components/ui/ClusterEventsToolbar.d.ts.map +1 -1
- package/@types/common/components/ui/StaticTextField.d.ts +1 -1
- package/@types/common/components/ui/StaticTextField.d.ts.map +1 -1
- package/@types/common/components/ui/eventsModal.d.ts.map +1 -1
- package/@types/common/components/ui/formik/validationSchemas.d.ts +5 -1
- package/@types/common/components/ui/formik/validationSchemas.d.ts.map +1 -1
- package/@types/common/config/constants.d.ts +1 -0
- package/@types/common/config/constants.d.ts.map +1 -1
- package/@types/common/types/events.d.ts +1 -0
- package/@types/common/types/events.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2StaticIP.d.ts.map +1 -1
- package/@types/ocm/components/AddHosts/day2Wizard/Day2Wizard.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/utils.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts +2 -1
- package/@types/ocm/components/clusterConfiguration/CpuArchitectureDropdown.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/DiscoveryImageForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.d.ts.map +1 -1
- package/@types/ocm/components/clusterDetail/AssistedInstallerDetailCard.d.ts.map +1 -1
- package/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts.map +1 -1
- package/@types/ocm/components/clusters/ClusterPage.d.ts.map +1 -1
- package/@types/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.d.ts.map +1 -1
- package/@types/ocm/components/fetching/fetchEvents.d.ts.map +1 -1
- package/@types/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.d.ts.map +1 -1
- package/@types/ocm/hooks/useInfraEnv.d.ts +1 -1
- package/@types/ocm/hooks/useInfraEnv.d.ts.map +1 -1
- package/@types/ocm/hooks/useInfraEnvId.d.ts +1 -1
- package/@types/ocm/hooks/useInfraEnvId.d.ts.map +1 -1
- package/@types/ocm/services/Day2ClusterService.d.ts +3 -3
- package/@types/ocm/services/Day2ClusterService.d.ts.map +1 -1
- package/@types/ocm/services/InfraEnvIdsCacheService.d.ts +1 -1
- package/@types/ocm/services/InfraEnvIdsCacheService.d.ts.map +1 -1
- package/@types/ocm/services/InfraEnvsService.d.ts +4 -3
- package/@types/ocm/services/InfraEnvsService.d.ts.map +1 -1
- package/@types/ocm/services/apis/EventsAPI.d.ts +1 -0
- package/@types/ocm/services/apis/EventsAPI.d.ts.map +1 -1
- package/build/build.json +1 -1
- package/build/cim/components/Agent/BMCForm.js +1 -1
- package/build/cim/components/Agent/BMCForm.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.js +1 -9
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.js +1 -2
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.js +3 -10
- package/build/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.js.map +1 -1
- package/build/cim/components/ClusterDeployment/use-networking-formik.js +2 -2
- package/build/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cim/components/ClusterDeployment/validationSchemas.js +0 -1
- package/build/cim/components/ClusterDeployment/validationSchemas.js.map +1 -1
- package/build/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js +2 -2
- package/build/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.js.map +1 -1
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js +10 -2
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js.map +1 -1
- package/build/cim/components/modals/AddHostModal.js +1 -1
- package/build/cim/components/modals/AddHostModal.js.map +1 -1
- package/build/cim/components/modals/EditProxyModal.js +18 -7
- package/build/cim/components/modals/EditProxyModal.js.map +1 -1
- package/build/common/components/clusterConfiguration/DiscoveryImageConfigForm.js +5 -5
- package/build/common/components/clusterConfiguration/DiscoveryImageConfigForm.js.map +1 -1
- package/build/common/components/clusterWizard/ClusterWizardStep.js +1 -1
- package/build/common/components/clusterWizard/ClusterWizardStep.js.map +1 -1
- package/build/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js +5 -2
- package/build/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js.map +1 -1
- package/build/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js +1 -1
- package/build/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js.map +1 -1
- package/build/common/components/fetching/EventListFetch.js +6 -5
- package/build/common/components/fetching/EventListFetch.js.map +1 -1
- package/build/common/components/hosts/status.js +1 -1
- package/build/common/components/hosts/status.js.map +1 -1
- package/build/common/components/ui/ClusterEventsToolbar.js +1 -1
- package/build/common/components/ui/ClusterEventsToolbar.js.map +1 -1
- package/build/common/components/ui/eventsModal.js +8 -3
- package/build/common/components/ui/eventsModal.js.map +1 -1
- package/build/common/components/ui/formik/validationSchemas.js +19 -12
- package/build/common/components/ui/formik/validationSchemas.js.map +1 -1
- package/build/common/config/constants.js +2 -0
- package/build/common/config/constants.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js +94 -20
- package/build/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.js +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2StaticIP.js +16 -9
- package/build/ocm/components/AddHosts/day2Wizard/Day2StaticIP.js.map +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2Wizard.js +1 -1
- package/build/ocm/components/AddHosts/day2Wizard/Day2Wizard.js.map +1 -1
- package/build/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js +5 -2
- package/build/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js.map +1 -1
- package/build/ocm/components/HostsClusterDetailTab/utils.js +5 -2
- package/build/ocm/components/HostsClusterDetailTab/utils.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js +5 -4
- package/build/ocm/components/clusterConfiguration/CpuArchitectureDropdown.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/DiscoveryImageForm.js +3 -1
- package/build/ocm/components/clusterConfiguration/DiscoveryImageForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js +11 -8
- package/build/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js +16 -5
- package/build/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +3 -2
- package/build/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js +1 -2
- package/build/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js +27 -16
- package/build/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.js +1 -1
- package/build/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.js.map +1 -1
- package/build/ocm/components/clusterDetail/AssistedInstallerDetailCard.js +5 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerDetailCard.js.map +1 -1
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js +5 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js.map +1 -1
- package/build/ocm/components/clusters/ClusterPage.js +8 -4
- package/build/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js +3 -2
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/components/fetching/fetchEvents.js +7 -3
- package/build/ocm/components/fetching/fetchEvents.js.map +1 -1
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js +3 -2
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/hooks/useInfraEnv.js +2 -2
- package/build/ocm/hooks/useInfraEnv.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvId.js +18 -3
- package/build/ocm/hooks/useInfraEnvId.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvImageUrl.js +1 -1
- package/build/ocm/hooks/useInfraEnvImageUrl.js.map +1 -1
- package/build/ocm/hooks/useInfraEnvIpxeImageUrl.js +1 -1
- package/build/ocm/hooks/useInfraEnvIpxeImageUrl.js.map +1 -1
- package/build/ocm/services/Day2ClusterService.js +11 -20
- package/build/ocm/services/Day2ClusterService.js.map +1 -1
- package/build/ocm/services/InfraEnvIdsCacheService.js +5 -4
- package/build/ocm/services/InfraEnvIdsCacheService.js.map +1 -1
- package/build/ocm/services/InfraEnvsService.js +7 -4
- package/build/ocm/services/InfraEnvsService.js.map +1 -1
- package/build/ocm/services/apis/EventsAPI.js +13 -1
- package/build/ocm/services/apis/EventsAPI.js.map +1 -1
- package/lib/cim/components/Agent/BMCForm.tsx +1 -1
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostSelectionStep.tsx +1 -12
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.tsx +1 -2
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsSelectionBasic.tsx +2 -10
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +2 -2
- package/lib/cim/components/ClusterDeployment/validationSchemas.ts +0 -1
- package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.tsx +2 -2
- package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/types.ts +0 -1
- package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx +10 -2
- package/lib/cim/components/modals/AddHostModal.tsx +1 -0
- package/lib/cim/components/modals/EditProxyModal.tsx +15 -3
- package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx +12 -9
- package/lib/common/components/clusterWizard/ClusterWizardStep.tsx +5 -1
- package/lib/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.tsx +11 -2
- package/lib/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.tsx +1 -1
- package/lib/common/components/fetching/EventListFetch.tsx +6 -5
- package/lib/common/components/hosts/status.tsx +1 -1
- package/lib/common/components/ui/ClusterEventsToolbar.tsx +3 -0
- package/lib/common/components/ui/StaticTextField.tsx +1 -1
- package/lib/common/components/ui/eventsModal.tsx +18 -2
- package/lib/common/components/ui/formik/validationSchemas.ts +32 -14
- package/lib/common/config/constants.ts +4 -0
- package/lib/common/types/events.ts +1 -0
- package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx +129 -21
- package/lib/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.tsx +1 -1
- package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIP.tsx +15 -10
- package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx +1 -0
- package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx +7 -3
- package/lib/ocm/components/HostsClusterDetailTab/utils.ts +8 -3
- package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx +9 -1
- package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx +25 -16
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +29 -8
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +9 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx +6 -13
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx +30 -32
- package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegration.tsx +1 -1
- package/lib/ocm/components/clusterDetail/AssistedInstallerDetailCard.tsx +12 -2
- package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx +9 -2
- package/lib/ocm/components/clusters/ClusterPage.tsx +17 -5
- package/lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx +6 -2
- package/lib/ocm/components/fetching/fetchEvents.ts +8 -3
- package/lib/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.tsx +6 -2
- package/lib/ocm/hooks/useInfraEnv.ts +10 -1
- package/lib/ocm/hooks/useInfraEnvId.ts +24 -4
- package/lib/ocm/hooks/useInfraEnvImageUrl.ts +1 -1
- package/lib/ocm/hooks/useInfraEnvIpxeImageUrl.ts +1 -1
- package/lib/ocm/services/Day2ClusterService.ts +12 -42
- package/lib/ocm/services/InfraEnvIdsCacheService.ts +9 -6
- package/lib/ocm/services/InfraEnvsService.ts +12 -13
- package/lib/ocm/services/apis/EventsAPI.ts +15 -1
- package/package.json +1 -1
|
@@ -8,9 +8,11 @@ import { selectCurrentClusterState } from '../../selectors';
|
|
|
8
8
|
import { Grid } from '@patternfly/react-core';
|
|
9
9
|
import { NewFeatureSupportLevelProvider } from '../newFeatureSupportLevels';
|
|
10
10
|
import useInfraEnv from '../../hooks/useInfraEnv';
|
|
11
|
+
import { usePullSecret } from '../../hooks';
|
|
11
12
|
const AssistedInstallerExtraDetailCard = ({ allEnabledFeatures, }) => {
|
|
12
13
|
const { data: cluster } = useSelector(selectCurrentClusterState);
|
|
13
|
-
const
|
|
14
|
+
const pullSecret = usePullSecret();
|
|
15
|
+
const { infraEnv } = useInfraEnv((cluster === null || cluster === void 0 ? void 0 : cluster.id) ? cluster === null || cluster === void 0 ? void 0 : cluster.id : '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) ? cluster.cpuArchitecture : CpuArchitecture.x86, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
14
16
|
if (!cluster || cluster.status === 'adding-hosts') {
|
|
15
17
|
return null;
|
|
16
18
|
}
|
|
@@ -21,6 +23,7 @@ const AssistedInstallerExtraDetailCard = ({ allEnabledFeatures, }) => {
|
|
|
21
23
|
React.createElement(ClusterProperties, { cluster: cluster, externalMode: true }))))));
|
|
22
24
|
};
|
|
23
25
|
const Wrapper = (props) => (React.createElement(Provider, { store: store },
|
|
24
|
-
React.createElement(
|
|
26
|
+
React.createElement(AlertsContextProvider, null,
|
|
27
|
+
React.createElement(AssistedInstallerExtraDetailCard, Object.assign({}, props)))));
|
|
25
28
|
export default Wrapper;
|
|
26
29
|
//# sourceMappingURL=AssistedInstallerExtraDetailCard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssistedInstallerExtraDetailCard.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,0BAA0B,GAE3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,WAAW,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"AssistedInstallerExtraDetailCard.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,0BAA0B,GAE3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAM5C,MAAM,gCAAgC,GAAoD,CAAC,EACzF,kBAAkB,GACnB,EAAE,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAC9B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,EAAC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAC9B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAC,CAAC,CAAE,OAAO,CAAC,eAAmC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,EAC7F,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EACb,UAAU,EACV,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAC1B,CAAC;IAEF,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,oBAAC,0BAA0B,IAAC,QAAQ,EAAE,kBAAkB;QACtD,oBAAC,qBAAqB;YACpB,oBAAC,8BAA8B,IAC7B,SAAS,EAAE,gCAAO,EAClB,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,EAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAE1C,oBAAC,IAAI,IAAC,SAAS,EAAC,YAAY;oBAC1B,oBAAC,iBAAiB,IAAC,OAAO,EAAE,OAAO,EAAE,YAAY,SAAG,CAC/C,CACwB,CACX,CACG,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAoD,CAAC,KAAK,EAAE,EAAE,CAAC,CAC1E,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK;IACpB,oBAAC,qBAAqB;QACpB,oBAAC,gCAAgC,oBAAK,KAAK,EAAI,CACzB,CACf,CACZ,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -33,14 +33,16 @@ import ClusterPollingErrorModal from '../clusterDetail/ClusterPollingErrorModal'
|
|
|
33
33
|
import ClusterUpdateErrorModal from '../clusterDetail/ClusterUpdateErrorModal';
|
|
34
34
|
import { BackButton } from '../ui/Buttons/BackButton';
|
|
35
35
|
import { NewFeatureSupportLevelProvider } from '../newFeatureSupportLevels';
|
|
36
|
-
|
|
36
|
+
import { usePullSecret } from '../../hooks';
|
|
37
|
+
const ClusterPageGeneric = ({ clusterId, showBreadcrumbs = false, }) => {
|
|
37
38
|
if (!clusterId) {
|
|
38
39
|
console.error('ClusterPageGeneric: missing clusterId');
|
|
39
40
|
}
|
|
40
41
|
const fetchCluster = useFetchCluster(clusterId);
|
|
41
42
|
const dispatch = useDispatch();
|
|
42
43
|
const { cluster, uiState, errorDetail } = useClusterPolling(clusterId);
|
|
43
|
-
const
|
|
44
|
+
const pullSecret = usePullSecret();
|
|
45
|
+
const { infraEnv, isLoading: infraEnvLoading, error: infraEnvError, updateInfraEnv, } = useInfraEnv(clusterId, (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) ? cluster.cpuArchitecture : CpuArchitecture.x86, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
44
46
|
const getContent = (cluster, infraEnv) => {
|
|
45
47
|
if (cluster.status === 'adding-hosts') {
|
|
46
48
|
const onReset = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -107,6 +109,8 @@ const ClusterPageGeneric = ({ clusterId, showBreadcrumbs, }) => {
|
|
|
107
109
|
}
|
|
108
110
|
return React.createElement(Redirect, { to: "/clusters" });
|
|
109
111
|
};
|
|
110
|
-
export const SingleClusterPage = ({ clusterId }) => (React.createElement(
|
|
111
|
-
|
|
112
|
+
export const SingleClusterPage = ({ clusterId }) => (React.createElement(AlertsContextProvider, null,
|
|
113
|
+
React.createElement(ClusterPageGeneric, { clusterId: clusterId })));
|
|
114
|
+
export const ClusterPage = ({ match }) => (React.createElement(AlertsContextProvider, null,
|
|
115
|
+
React.createElement(ClusterPageGeneric, { clusterId: match.params.clusterId, showBreadcrumbs: true })));
|
|
112
116
|
//# sourceMappingURL=ClusterPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterPage.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAuB,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EAErB,eAAe,EACf,UAAU,EAEV,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,uBAAuB,MAAM,0CAA0C,CAAC;AAC/E,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,mCAAmC,EAAE,MAAM,4DAA4D,CAAC;AACjH,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,4BAA4B,MAAM,+CAA+C,CAAC;AACzF,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,wBAAwB,MAAM,2CAA2C,CAAC;AACjF,OAAO,uBAAuB,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterPage.js","sourceRoot":"","sources":["../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { CpuArchitecture, FeatureSupportLevelContextProvider, getDefaultCpuArchi
|
|
|
5
5
|
import { handleApiError } from '../../api';
|
|
6
6
|
import { FeatureSupportLevelsAPI } from '../../services/apis';
|
|
7
7
|
import { captureException } from '../../sentry';
|
|
8
|
-
import { useOpenshiftVersions } from '../../hooks';
|
|
8
|
+
import { useOpenshiftVersions, usePullSecret } from '../../hooks';
|
|
9
9
|
import { getFeatureDisabledReason, isFeatureSupported } from './featureStateUtils';
|
|
10
10
|
import useInfraEnv from '../../hooks/useInfraEnv';
|
|
11
11
|
import { isFeatureSupportedAndAvailable } from '../newFeatureSupportLevels/newFeatureStateUtils';
|
|
@@ -49,7 +49,8 @@ export const getFeatureSupported = (openshiftVersion, featureSupportLevels, feat
|
|
|
49
49
|
};
|
|
50
50
|
export const FeatureSupportLevelProvider = ({ cluster, children, loadingUi, }) => {
|
|
51
51
|
const { loading: loadingOCPVersions, versions: versionOptions } = useOpenshiftVersions();
|
|
52
|
-
const
|
|
52
|
+
const pullSecret = usePullSecret();
|
|
53
|
+
const { infraEnv, isLoading: isInfraEnvLoading } = useInfraEnv((cluster === null || cluster === void 0 ? void 0 : cluster.id) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) ? cluster.cpuArchitecture : CpuArchitecture.x86, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
53
54
|
const fetcher = () => FeatureSupportLevelsAPI.list().then((res) => res.data);
|
|
54
55
|
const { data: featureSupportLevels, error } = useSWR(FeatureSupportLevelsAPI.makeBaseURI(), fetcher, { errorRetryCount: 0, revalidateOnFocus: false });
|
|
55
56
|
const isLoading = (!featureSupportLevels && !error) || loadingOCPVersions || isInfraEnvLoading;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,KAAK,CAAC;AACzB,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAGL,eAAe,EAGf,kCAAkC,EAIlC,yBAAyB,GAE1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"FeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,17 @@ import { handleApiError } from '../../api';
|
|
|
11
11
|
import { EventsAPI } from '../../services/apis';
|
|
12
12
|
export const onFetchEvents = (props, onSuccess, onError) => __awaiter(void 0, void 0, void 0, function* () {
|
|
13
13
|
try {
|
|
14
|
+
EventsAPI.abort();
|
|
14
15
|
const response = yield EventsAPI.list(props);
|
|
15
16
|
onSuccess(response);
|
|
16
17
|
}
|
|
17
18
|
catch (error) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const { code } = error;
|
|
20
|
+
if (!code || code !== 'ERR_CANCELED') {
|
|
21
|
+
handleApiError(error, () => {
|
|
22
|
+
onError('Failed to load events');
|
|
23
|
+
});
|
|
24
|
+
}
|
|
21
25
|
}
|
|
22
26
|
});
|
|
23
27
|
//# sourceMappingURL=fetchEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,aAAa,GAAyC,CACjE,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE;IACF,IAAI;QACF,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,SAAS,CAAC,QAAQ,CAAC,CAAC;KACrB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,EAAE,IAAI,EAAE,GAAG,KAAmB,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,cAAc,EAAE;YACpC,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE;gBACzB,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACJ;KACF;AACH,CAAC,CAAA,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { CpuArchitecture, getDefaultCpuArchitecture, } from '../../../common';
|
|
3
|
-
import { useOpenshiftVersions } from '../../hooks';
|
|
3
|
+
import { useOpenshiftVersions, usePullSecret } from '../../hooks';
|
|
4
4
|
import { getNewFeatureDisabledReason, isFeatureSupportedAndAvailable, } from './newFeatureStateUtils';
|
|
5
5
|
import useInfraEnv from '../../hooks/useInfraEnv';
|
|
6
6
|
import { NewFeatureSupportLevelContextProvider, } from '../../../common/components/newFeatureSupportLevels';
|
|
@@ -10,7 +10,8 @@ export const getFeatureSupported = (featureSupportLevels, featureId) => {
|
|
|
10
10
|
};
|
|
11
11
|
export const NewFeatureSupportLevelProvider = ({ cluster, children, loadingUi, cpuArchitecture, openshiftVersion, }) => {
|
|
12
12
|
const { loading: loadingOCPVersions } = useOpenshiftVersions();
|
|
13
|
-
const
|
|
13
|
+
const pullSecret = usePullSecret();
|
|
14
|
+
const { infraEnv, isLoading: isInfraEnvLoading } = useInfraEnv((cluster === null || cluster === void 0 ? void 0 : cluster.id) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) ? cluster.cpuArchitecture : CpuArchitecture.x86, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
14
15
|
const featureSupportLevels = useSupportLevelsAPI('features', openshiftVersion, cpuArchitecture);
|
|
15
16
|
const supportLevelData = React.useMemo(() => {
|
|
16
17
|
if (!featureSupportLevels) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../lib/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAGL,eAAe,EAEf,yBAAyB,GAG1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"NewFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../lib/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,10 @@ import { CpuArchitecture } from '../../common';
|
|
|
13
13
|
import { getErrorMessage } from '../../common/utils';
|
|
14
14
|
import { InfraEnvsAPI } from '../services/apis';
|
|
15
15
|
import InfraEnvIdsCacheService from '../services/InfraEnvIdsCacheService';
|
|
16
|
-
export default function useInfraEnv(clusterId, cpuArchitecture) {
|
|
16
|
+
export default function useInfraEnv(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) {
|
|
17
17
|
const [infraEnv, setInfraEnv] = React.useState();
|
|
18
18
|
const [error, setError] = React.useState('');
|
|
19
|
-
const { infraEnvId, error: infraEnvIdError } = useInfraEnvId(clusterId, cpuArchitecture);
|
|
19
|
+
const { infraEnvId, error: infraEnvIdError } = useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion);
|
|
20
20
|
const getInfraEnv = React.useCallback(() => __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
try {
|
|
22
22
|
if (infraEnvId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInfraEnv.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnv.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,EAAW,eAAe,EAAkC,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,uBAAuB,MAAM,qCAAqC,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,SAAwB,EACxB,eAAgC;
|
|
1
|
+
{"version":3,"file":"useInfraEnv.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnv.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,EAAW,eAAe,EAAkC,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,uBAAuB,MAAM,qCAAqC,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAOzB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAY,CAAC;IAC3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,aAAa,CAC1D,SAAS,EACT,eAAe,EACf,WAAW,EACX,UAAU,EACV,gBAAgB,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC/C,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC9D,WAAW,CAAC,QAAQ,CAAC,CAAC;aACvB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,uBAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC;YAC3F,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5B,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CACtC,CAAO,oBAA0C,EAAE,EAAE;QACnD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,iEAAiE,CAAC;SACzE;QACD,YAAY,CAAC,mBAAmB,EAAE,CAAC;QACnC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAC7E,WAAW,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,eAAe,CAAC,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,EAAE;gBACb,KAAK,WAAW,EAAE,CAAC;aACpB;SACF;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAEzD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;AAC7E,CAAC"}
|
|
@@ -10,18 +10,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import React from 'react';
|
|
11
11
|
import { getErrorMessage } from '../../common/utils';
|
|
12
12
|
import { InfraEnvsService } from '../services';
|
|
13
|
-
export default function useInfraEnvId(clusterId, cpuArchitecture) {
|
|
13
|
+
export default function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) {
|
|
14
14
|
const [infraEnvId, setInfraEnv] = React.useState();
|
|
15
15
|
const [error, setError] = React.useState('');
|
|
16
16
|
const findInfraEnvId = React.useCallback(() => __awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
try {
|
|
18
18
|
const infraEnvId = yield InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
|
|
19
|
-
|
|
19
|
+
if (infraEnvId && !(infraEnvId instanceof Error)) {
|
|
20
|
+
setInfraEnv(infraEnvId);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
//If infraEnv doesn't exist create a new one
|
|
24
|
+
if (pullSecret) {
|
|
25
|
+
const infraEnv = yield InfraEnvsService.create({
|
|
26
|
+
name: InfraEnvsService.makeInfraEnvName(cpuArchitecture, clusterName),
|
|
27
|
+
pullSecret,
|
|
28
|
+
clusterId: clusterId,
|
|
29
|
+
openshiftVersion,
|
|
30
|
+
cpuArchitecture: cpuArchitecture,
|
|
31
|
+
});
|
|
32
|
+
setInfraEnv(infraEnv.id);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
20
35
|
}
|
|
21
36
|
catch (e) {
|
|
22
37
|
setError(getErrorMessage(e));
|
|
23
38
|
}
|
|
24
|
-
}), [clusterId, cpuArchitecture]);
|
|
39
|
+
}), [clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion]);
|
|
25
40
|
React.useEffect(() => {
|
|
26
41
|
if (!clusterId) {
|
|
27
42
|
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,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,CAAC,OAAO,UAAU,aAAa,
|
|
1
|
+
{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE7C,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,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,gBAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS,EAAE,SAAS;wBACpB,gBAAgB;wBAChB,eAAe,EAAE,eAAyC;qBAC3D,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC1B;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE5E,KAAK,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"}
|
|
@@ -15,7 +15,7 @@ export default function useInfraEnvImageUrl() {
|
|
|
15
15
|
const getIsoImageUrl = React.useCallback((clusterId, cpuArchitecture) => __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
try {
|
|
17
17
|
const infraEnvId = yield InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
|
|
18
|
-
if (!infraEnvId) {
|
|
18
|
+
if (!infraEnvId || infraEnvId instanceof Error) {
|
|
19
19
|
return { url: '', error: `Failed to retrieve the infraEnv for ${clusterId}` };
|
|
20
20
|
}
|
|
21
21
|
const { data: { url }, } = yield InfraEnvsAPI.getImageUrl(infraEnvId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInfraEnvImageUrl.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnvImageUrl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,mBAAmB;IACzC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CACtC,CAAO,SAAwB,EAAE,eAAgC,EAAmB,EAAE;QACpF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,CAAC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"useInfraEnvImageUrl.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnvImageUrl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,mBAAmB;IACzC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CACtC,CAAO,SAAwB,EAAE,eAAgC,EAAmB,EAAE;QACpF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,CAAC,UAAU,IAAI,UAAU,YAAY,KAAK,EAAE;gBAC9C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,uCAAuC,SAAS,EAAE,EAAE,CAAC;aAC/E;YAED,MAAM,EACJ,IAAI,EAAE,EAAE,GAAG,EAAE,GACd,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC/C,OAAO;gBACL,GAAG;gBACH,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mEAAmE;aACtF,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/C;IACH,CAAC,CAAA,EACD,EAAE,CACH,CAAC;IAEF,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC"}
|
|
@@ -15,7 +15,7 @@ export default function useInfraEnvIpxeImageUrl() {
|
|
|
15
15
|
const getIpxeImageUrl = React.useCallback((clusterId, cpuArchitecture) => __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
try {
|
|
17
17
|
const infraEnvId = yield InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
|
|
18
|
-
if (!infraEnvId) {
|
|
18
|
+
if (!infraEnvId || infraEnvId instanceof Error) {
|
|
19
19
|
return { url: '', error: `Failed to retrieve the infraEnv for ${clusterId}` };
|
|
20
20
|
}
|
|
21
21
|
const { data: { url }, } = yield InfraEnvsAPI.getIpxeImageUrl(infraEnvId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInfraEnvIpxeImageUrl.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnvIpxeImageUrl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,uBAAuB;IAC7C,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CACvC,CAAO,SAAwB,EAAE,eAAgC,EAAmB,EAAE;QACpF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,CAAC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"useInfraEnvIpxeImageUrl.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useInfraEnvIpxeImageUrl.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,uBAAuB;IAC7C,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CACvC,CAAO,SAAwB,EAAE,eAAgC,EAAmB,EAAE;QACpF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,CAAC,UAAU,IAAI,UAAU,YAAY,KAAK,EAAE;gBAC9C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,uCAAuC,SAAS,EAAE,EAAE,CAAC;aAC/E;YAED,MAAM,EACJ,IAAI,EAAE,EAAE,GAAG,EAAE,GACd,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACnD,OAAO;gBACL,GAAG;gBACH,KAAK,EAAE,GAAG;oBACR,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,wEAAwE;aAC7E,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/C;IACH,CAAC,CAAA,EACD,EAAE,CACH,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC"}
|
|
@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { InfraEnvsService } from '.';
|
|
11
11
|
import { ClustersAPI } from './apis';
|
|
12
|
-
import {
|
|
13
|
-
import { mapOcmArchToCpuArchitecture, mapClusterCpuArchToInfraEnvCpuArch, } from './CpuArchitectureService';
|
|
12
|
+
import { mapOcmArchToCpuArchitecture } from './CpuArchitectureService';
|
|
14
13
|
export const getApiVipDnsName = (ocmCluster) => {
|
|
15
14
|
var _a, _b;
|
|
16
15
|
let apiVipDnsname = '';
|
|
@@ -42,7 +41,7 @@ const Day2ClusterService = {
|
|
|
42
41
|
getOpenshiftClusterId(ocmCluster) {
|
|
43
42
|
return ocmCluster && ocmCluster.external_id;
|
|
44
43
|
},
|
|
45
|
-
fetchCluster(ocmCluster, pullSecret, openshiftVersion
|
|
44
|
+
fetchCluster(ocmCluster, pullSecret, openshiftVersion) {
|
|
46
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
46
|
const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmCluster);
|
|
48
47
|
if (!openshiftClusterId) {
|
|
@@ -53,12 +52,7 @@ const Day2ClusterService = {
|
|
|
53
52
|
if (day2ClusterId) {
|
|
54
53
|
return Day2ClusterService.fetchClusterById(day2ClusterId);
|
|
55
54
|
}
|
|
56
|
-
|
|
57
|
-
const createMultipleInfraEnvs = ocmCluster.cpu_architecture === OcmCpuArchitecture.MULTI || canSelectCpuArch;
|
|
58
|
-
const cpuArchitectures = createMultipleInfraEnvs
|
|
59
|
-
? getSupportedCpuArchitectures(canSelectCpuArch ? canSelectCpuArch : false, cpuArchitecturesByVersionImage, mapClusterCpuArchToInfraEnvCpuArch(ocmCluster.cpu_architecture))
|
|
60
|
-
: [mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture)];
|
|
61
|
-
return Day2ClusterService.createCluster(openshiftClusterId, ocmCluster.display_name || ocmCluster.name || openshiftClusterId, getApiVipDnsName(ocmCluster).apiVipDnsname, pullSecret, openshiftVersion, cpuArchitectures);
|
|
55
|
+
return Day2ClusterService.createCluster(openshiftClusterId, ocmCluster.display_name || ocmCluster.name || openshiftClusterId, getApiVipDnsName(ocmCluster).apiVipDnsname, pullSecret, openshiftVersion, mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture));
|
|
62
56
|
});
|
|
63
57
|
},
|
|
64
58
|
fetchClusterById(clusterId) {
|
|
@@ -77,7 +71,7 @@ const Day2ClusterService = {
|
|
|
77
71
|
return undefined;
|
|
78
72
|
});
|
|
79
73
|
},
|
|
80
|
-
createCluster(openshiftClusterId, clusterName, apiVipDnsname, pullSecret, openshiftVersion,
|
|
74
|
+
createCluster(openshiftClusterId, clusterName, apiVipDnsname, pullSecret, openshiftVersion, cpuArchitecture) {
|
|
81
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
76
|
const { data: day2Cluster } = yield ClustersAPI.registerAddHosts({
|
|
83
77
|
openshiftClusterId,
|
|
@@ -85,17 +79,14 @@ const Day2ClusterService = {
|
|
|
85
79
|
apiVipDnsname,
|
|
86
80
|
openshiftVersion,
|
|
87
81
|
});
|
|
88
|
-
// Create the
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
cpuArchitecture: cpuArchitecture,
|
|
96
|
-
});
|
|
82
|
+
// Create only the infraenv for the day1 cpu architecture
|
|
83
|
+
yield InfraEnvsService.create({
|
|
84
|
+
name: InfraEnvsService.makeInfraEnvName(cpuArchitecture, day2Cluster.name),
|
|
85
|
+
pullSecret,
|
|
86
|
+
clusterId: day2Cluster.id,
|
|
87
|
+
openshiftVersion,
|
|
88
|
+
cpuArchitecture: cpuArchitecture,
|
|
97
89
|
});
|
|
98
|
-
yield Promise.all(infraEnvsToCreate);
|
|
99
90
|
return day2Cluster;
|
|
100
91
|
});
|
|
101
92
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Day2ClusterService.js","sourceRoot":"","sources":["../../../lib/ocm/services/Day2ClusterService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Day2ClusterService.js","sourceRoot":"","sources":["../../../lib/ocm/services/Day2ClusterService.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,15 +27,16 @@ const InfraEnvIdsCacheService = {
|
|
|
27
27
|
},
|
|
28
28
|
getInfraEnvId(clusterId, cpuArchitecture) {
|
|
29
29
|
if (!clusterId || !cpuArchitecture) {
|
|
30
|
-
return
|
|
30
|
+
return new Error(`clusterId or cpuArchitecture are missing`);
|
|
31
31
|
}
|
|
32
32
|
const cache = read();
|
|
33
33
|
const clusterInfraEnvs = cache[clusterId];
|
|
34
34
|
if (!clusterInfraEnvs) {
|
|
35
|
-
return
|
|
35
|
+
return new Error(`Not infraEnvs found for this cluster ${clusterId}`);
|
|
36
36
|
}
|
|
37
|
-
if (cpuArchitecture !== CpuArchitecture.USE_DAY1_ARCHITECTURE
|
|
38
|
-
|
|
37
|
+
if (cpuArchitecture !== CpuArchitecture.USE_DAY1_ARCHITECTURE &&
|
|
38
|
+
cpuArchitecture !== CpuArchitecture.MULTI) {
|
|
39
|
+
return clusterInfraEnvs[cpuArchitecture] || new Error(`InfraEnv can't be found`);
|
|
39
40
|
}
|
|
40
41
|
const architectures = getAllCpuArchitectures().filter((arch) => {
|
|
41
42
|
return clusterInfraEnvs[arch];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InfraEnvIdsCacheService.js","sourceRoot":"","sources":["../../../lib/ocm/services/InfraEnvIdsCacheService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAY,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE1F,MAAM,SAAS,GAAG,wBAAwB,CAAC;AAK3C,MAAM,MAAM,GAAG,CAAC,KAAoB,EAAQ,EAAE;IAC5C,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,GAAkB,EAAE;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC;IAE7D,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAkB,CAAC;KAC3C;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AASF,MAAM,uBAAuB,GAAoB;IAC/C,GAAG,CAAC,KAAa;QACf,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,MAAM;QACR,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,KAAK;QACH,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,SAAiB,EAAE,eAAgC;QAC/D,IAAI,CAAC,SAAS,IAAI,CAAC,eAAe,EAAE;YAClC,OAAO,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"InfraEnvIdsCacheService.js","sourceRoot":"","sources":["../../../lib/ocm/services/InfraEnvIdsCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const InfraEnvsService = {
|
|
|
14
14
|
getInfraEnvId(clusterId, cpuArchitecture) {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
let infraEnvId = InfraEnvCache.getInfraEnvId(clusterId, cpuArchitecture);
|
|
17
|
-
if (infraEnvId
|
|
17
|
+
if (infraEnvId instanceof Error) {
|
|
18
18
|
const { data: infraEnvs } = yield InfraEnvsAPI.list(clusterId);
|
|
19
19
|
if (infraEnvs.length > 0) {
|
|
20
20
|
InfraEnvCache.updateInfraEnvs(clusterId, infraEnvs);
|
|
@@ -22,7 +22,6 @@ const InfraEnvsService = {
|
|
|
22
22
|
}
|
|
23
23
|
if (!infraEnvId) {
|
|
24
24
|
InfraEnvCache.removeInfraEnvId(clusterId, cpuArchitecture);
|
|
25
|
-
throw new Error(`No InfraEnv could be found for clusterId: ${clusterId} and architecture ${cpuArchitecture || ''}`);
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
return infraEnvId;
|
|
@@ -31,12 +30,12 @@ const InfraEnvsService = {
|
|
|
31
30
|
getInfraEnv(clusterId, cpuArchitecture) {
|
|
32
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
32
|
const infraEnvId = yield InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
|
|
34
|
-
if (infraEnvId) {
|
|
33
|
+
if (infraEnvId && !(infraEnvId instanceof Error)) {
|
|
35
34
|
const { data } = yield InfraEnvsAPI.get(infraEnvId);
|
|
36
35
|
return data;
|
|
37
36
|
}
|
|
38
37
|
else {
|
|
39
|
-
|
|
38
|
+
return new Error(`Failed to retrieve the infraEnv for ${clusterId}`);
|
|
40
39
|
}
|
|
41
40
|
});
|
|
42
41
|
},
|
|
@@ -62,6 +61,7 @@ const InfraEnvsService = {
|
|
|
62
61
|
throw new Error('API returned no ID for the underlying InfraEnv');
|
|
63
62
|
}
|
|
64
63
|
InfraEnvCache.updateInfraEnvs(params.clusterId, [infraEnv]);
|
|
64
|
+
return infraEnv;
|
|
65
65
|
});
|
|
66
66
|
},
|
|
67
67
|
removeAll(clusterId) {
|
|
@@ -113,6 +113,9 @@ const InfraEnvsService = {
|
|
|
113
113
|
});
|
|
114
114
|
});
|
|
115
115
|
},
|
|
116
|
+
makeInfraEnvName(cpuArchitecture, name) {
|
|
117
|
+
return `${name || ''}_infra-env-${cpuArchitecture}`;
|
|
118
|
+
},
|
|
116
119
|
};
|
|
117
120
|
export default InfraEnvsService;
|
|
118
121
|
//# sourceMappingURL=InfraEnvsService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":";;;;;;;;;AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAEnG,MAAM,gBAAgB,GAAG;IACjB,aAAa,
|
|
1
|
+
{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
import { client } from '../../api';
|
|
2
|
+
let _getRequestAbortController = new AbortController();
|
|
2
3
|
const EventsAPI = {
|
|
3
4
|
makeBaseURI() {
|
|
4
5
|
return '/v2/events';
|
|
5
6
|
},
|
|
7
|
+
abort() {
|
|
8
|
+
_getRequestAbortController.abort();
|
|
9
|
+
/*
|
|
10
|
+
* The AbortController.signal can only be aborted once per instance.
|
|
11
|
+
* Therefore in order for other requests to be also abortable we need
|
|
12
|
+
* to create a new instance when this event occurs
|
|
13
|
+
*/
|
|
14
|
+
_getRequestAbortController = new AbortController();
|
|
15
|
+
},
|
|
6
16
|
createParams({ clusterId, hostIds, infraEnvId, severities, deletedHosts = true, clusterLevel = true, message, limit = 10, offset = 0, }) {
|
|
7
17
|
let params = '?';
|
|
8
18
|
params += 'order=descending&';
|
|
@@ -18,7 +28,9 @@ const EventsAPI = {
|
|
|
18
28
|
return params;
|
|
19
29
|
},
|
|
20
30
|
list(options) {
|
|
21
|
-
return client.get(`${EventsAPI.makeBaseURI()}${EventsAPI.createParams(options)}
|
|
31
|
+
return client.get(`${EventsAPI.makeBaseURI()}${EventsAPI.createParams(options)}`, {
|
|
32
|
+
signal: _getRequestAbortController.signal,
|
|
33
|
+
});
|
|
22
34
|
},
|
|
23
35
|
};
|
|
24
36
|
export default EventsAPI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/services/apis/EventsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,MAAM,SAAS,GAAG;IAChB,WAAW;QACT,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,YAAY,CAAC,EACX,SAAS,EACT,OAAO,EACP,UAAU,EACV,UAAU,EACV,YAAY,GAAG,IAAI,EACnB,YAAY,GAAG,IAAI,EACnB,OAAO,EACP,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,GACD;QACT,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,MAAM,IAAI,mBAAmB,CAAC;QAE9B,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,cAAc,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAC,CAAC,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,gBAAgB,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1D,MAAM,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAC,CAAC,CAAC,cAAc,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,iBAAiB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,iBAAiB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,WAAW,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnE,MAAM,IAAI,SAAS,KAAK,GAAG,CAAC;QAC5B,MAAM,IAAI,UAAU,MAAM,EAAE,CAAC;QAE7B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,OAAiB;QACpB,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,SAAS,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EventsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/services/apis/EventsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,IAAI,0BAA0B,GAAG,IAAI,eAAe,EAAE,CAAC;AAEvD,MAAM,SAAS,GAAG;IAChB,WAAW;QACT,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK;QACH,0BAA0B,CAAC,KAAK,EAAE,CAAC;QACnC;;;;WAIG;QACH,0BAA0B,GAAG,IAAI,eAAe,EAAE,CAAC;IACrD,CAAC;IAED,YAAY,CAAC,EACX,SAAS,EACT,OAAO,EACP,UAAU,EACV,UAAU,EACV,YAAY,GAAG,IAAI,EACnB,YAAY,GAAG,IAAI,EACnB,OAAO,EACP,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,GACD;QACT,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,MAAM,IAAI,mBAAmB,CAAC;QAE9B,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,cAAc,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAC,CAAC,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,gBAAgB,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1D,MAAM,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAC,CAAC,CAAC,cAAc,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,iBAAiB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,iBAAiB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,WAAW,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnE,MAAM,IAAI,SAAS,KAAK,GAAG,CAAC;QAC5B,MAAM,IAAI,UAAU,MAAM,EAAE,CAAC;QAE7B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,OAAiB;QACpB,OAAO,MAAM,CAAC,GAAG,CAAY,GAAG,SAAS,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE;YAC3F,MAAM,EAAE,0BAA0B,CAAC,MAAM;SAC1C,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
@@ -183,7 +183,7 @@ const emptyValues: AddBmcValues = {
|
|
|
183
183
|
password: '',
|
|
184
184
|
bootMACAddress: '',
|
|
185
185
|
disableCertificateVerification: true, // TODO(mlibra)
|
|
186
|
-
online:
|
|
186
|
+
online: true,
|
|
187
187
|
nmState: '',
|
|
188
188
|
macMapping: [{ macAddress: '', name: '' }],
|
|
189
189
|
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import * as Yup from 'yup';
|
|
3
|
-
import { TestOptionsMessage } from 'yup';
|
|
4
3
|
import { Formik, FormikConfig, useFormikContext } from 'formik';
|
|
5
4
|
import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
|
|
6
5
|
import { ClusterWizardStepHeader, useAlerts } from '../../../common';
|
|
@@ -74,19 +73,9 @@ const getInitialValues = ({
|
|
|
74
73
|
};
|
|
75
74
|
};
|
|
76
75
|
|
|
77
|
-
const getMinHostsCount = (selectedHostsCount: number) => (selectedHostsCount === 4 ? 5 : 3);
|
|
78
|
-
|
|
79
76
|
const getValidationSchema = (agentClusterInstall: AgentClusterInstallK8sResource, t: TFunction) => {
|
|
80
77
|
const isSNOCluster = getIsSNOCluster(agentClusterInstall);
|
|
81
78
|
|
|
82
|
-
const getMinMessage: TestOptionsMessage<{ min: number }> = ({ min }) => {
|
|
83
|
-
const message = t('ai:Please select at least {{min}} hosts for the cluster', { min });
|
|
84
|
-
if (min === 5) {
|
|
85
|
-
return `${message} ${t('ai:or select just 3 hosts instead.')}`;
|
|
86
|
-
}
|
|
87
|
-
return `${message}.`;
|
|
88
|
-
};
|
|
89
|
-
|
|
90
79
|
return Yup.lazy<ClusterDeploymentHostsSelectionValues>((values) => {
|
|
91
80
|
return Yup.object<ClusterDeploymentHostsSelectionValues>().shape({
|
|
92
81
|
hostCount: isSNOCluster ? Yup.number() : hostCountValidationSchema(t),
|
|
@@ -100,7 +89,7 @@ const getValidationSchema = (agentClusterInstall: AgentClusterInstallK8sResource
|
|
|
100
89
|
? Yup.array<string>()
|
|
101
90
|
.min(1, t('ai:Please select one host for the cluster.'))
|
|
102
91
|
.max(1, t('ai:Please select one host for the cluster.')) // TODO(jtomasek): replace this with Yup.array().length() after updating Yup
|
|
103
|
-
: Yup.array<string>().min(
|
|
92
|
+
: Yup.array<string>().min(3, t('ai:Please select at least 3 hosts for the cluster.')),
|
|
104
93
|
});
|
|
105
94
|
});
|
|
106
95
|
};
|