@openshift-assisted/ui-lib 2.8.2-cim → 2.8.4-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/ClusterDeploymentDetails.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.d.ts +6 -1
- package/@types/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.d.ts.map +1 -1
- 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/ClusterDeploymentWizardNavigation.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/helpers.d.ts +1 -1
- package/@types/cim/components/ClusterDeployment/helpers.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/Hypershift/modals/ManageHostsModal.d.ts.map +1 -1
- package/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts +2 -0
- package/@types/cim/components/InfraEnv/InfraEnvFormPage.d.ts.map +1 -1
- package/@types/cim/components/helpers/versions.d.ts +1 -0
- package/@types/cim/components/helpers/versions.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 +5 -1
- package/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts.map +1 -1
- package/@types/common/components/clusterConfiguration/DownloadIso.d.ts +2 -1
- package/@types/common/components/clusterConfiguration/DownloadIso.d.ts.map +1 -1
- package/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.d.ts +2 -0
- package/@types/common/components/clusterConfiguration/OpenShiftVersionSelect.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 +1 -1
- package/@types/common/components/fetching/EventListFetch.d.ts.map +1 -1
- package/@types/common/components/hosts/TableToolbar.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 +4 -8
- package/@types/common/components/ui/eventsModal.d.ts.map +1 -1
- package/@types/common/components/ui/formik/UploadField.d.ts.map +1 -1
- package/@types/common/components/ui/formik/types.d.ts +2 -2
- package/@types/common/components/ui/formik/types.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 +2 -1
- package/@types/common/config/constants.d.ts.map +1 -1
- package/@types/common/types/events.d.ts +9 -2
- 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/types.d.ts +5 -0
- package/@types/ocm/components/HostsClusterDetailTab/types.d.ts.map +1 -1
- package/@types/ocm/components/HostsClusterDetailTab/utils.d.ts +2 -7
- 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/manifestsConfiguration/components/CustomManifestsForm.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.d.ts +1 -0
- package/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.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/clusterWizard/ClusterWizardContextProvider.d.ts.map +1 -1
- package/@types/ocm/components/clusterWizard/wizardTransition.d.ts +2 -1
- package/@types/ocm/components/clusterWizard/wizardTransition.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/components/ui/OcmFormFields.d.ts +1 -1
- package/@types/ocm/hooks/useClusterCustomManifests.d.ts +1 -1
- package/@types/ocm/hooks/useClusterCustomManifests.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/selectors/clusters.d.ts +3 -3
- 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/@types/ocm/store/slices/infraEnvs/selectors.d.ts +1 -1
- package/build/build.json +1 -1
- package/build/cim/components/Agent/BMCForm.js +2 -2
- package/build/cim/components/Agent/BMCForm.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetails.js +59 -56
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetails.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.js +10 -6
- package/build/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.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/ClusterDeploymentWizardNavigation.js +2 -2
- package/build/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.js.map +1 -1
- package/build/cim/components/ClusterDeployment/ClusterDetailsFormFields.js +6 -2
- package/build/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map +1 -1
- package/build/cim/components/ClusterDeployment/helpers.js +46 -7
- package/build/cim/components/ClusterDeployment/helpers.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/Hypershift/modals/ManageHostsModal.js +1 -6
- package/build/cim/components/Hypershift/modals/ManageHostsModal.js.map +1 -1
- package/build/cim/components/Hypershift/utils/nodepool.js +5 -5
- package/build/cim/components/Hypershift/utils/nodepool.js.map +1 -1
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js +13 -5
- package/build/cim/components/InfraEnv/InfraEnvFormPage.js.map +1 -1
- package/build/cim/components/helpers/versions.js +1 -0
- package/build/cim/components/helpers/versions.js.map +1 -1
- package/build/cim/components/modals/AddHostModal.js +4 -4
- 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 +9 -9
- package/build/common/components/clusterConfiguration/DiscoveryImageConfigForm.js.map +1 -1
- package/build/common/components/clusterConfiguration/DownloadIso.js +2 -2
- package/build/common/components/clusterConfiguration/DownloadIso.js.map +1 -1
- package/build/common/components/clusterConfiguration/OpenShiftVersionSelect.js +2 -2
- package/build/common/components/clusterConfiguration/OpenShiftVersionSelect.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 +14 -25
- package/build/common/components/fetching/EventListFetch.js.map +1 -1
- package/build/common/components/hosts/TableToolbar.js +3 -3
- package/build/common/components/hosts/TableToolbar.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 +12 -6
- package/build/common/components/ui/eventsModal.js.map +1 -1
- package/build/common/components/ui/formik/CodeField.js +1 -1
- package/build/common/components/ui/formik/CodeField.js.map +1 -1
- package/build/common/components/ui/formik/SelectField.js +1 -1
- package/build/common/components/ui/formik/SelectField.js.map +1 -1
- package/build/common/components/ui/formik/UploadField.js +1 -2
- package/build/common/components/ui/formik/UploadField.js.map +1 -1
- package/build/common/components/ui/formik/validationSchemas.js +20 -13
- package/build/common/components/ui/formik/validationSchemas.js.map +1 -1
- package/build/common/config/constants.js +3 -1
- 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 +35 -29
- 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/manifestsConfiguration/components/CustomManifestsForm.js +49 -21
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsForm.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.js +3 -9
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.js +37 -2
- package/build/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.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 +5 -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 +7 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerDetailCard.js.map +1 -1
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js +7 -2
- package/build/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js.map +1 -1
- package/build/ocm/components/clusterWizard/ClusterWizardContextProvider.js +13 -3
- package/build/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map +1 -1
- package/build/ocm/components/clusterWizard/wizardTransition.js +10 -2
- package/build/ocm/components/clusterWizard/wizardTransition.js.map +1 -1
- package/build/ocm/components/clusters/ClusterPage.js +10 -4
- package/build/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js +5 -2
- package/build/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/components/fetching/fetchEvents.js +25 -4
- package/build/ocm/components/fetching/fetchEvents.js.map +1 -1
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js +5 -2
- package/build/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.js.map +1 -1
- package/build/ocm/hooks/useClusterCustomManifests.js +5 -3
- package/build/ocm/hooks/useClusterCustomManifests.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/ClustersService.js +2 -2
- package/build/ocm/services/ClustersService.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 +2 -2
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetails.tsx +112 -101
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsStep.tsx +17 -5
- 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/ClusterDeploymentWizardNavigation.tsx +7 -2
- package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx +9 -2
- package/lib/cim/components/ClusterDeployment/helpers.ts +65 -15
- 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/Hypershift/modals/ManageHostsModal.tsx +1 -6
- package/lib/cim/components/Hypershift/utils/nodepool.ts +1 -1
- package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx +21 -4
- package/lib/cim/components/helpers/versions.ts +5 -0
- package/lib/cim/components/modals/AddHostModal.tsx +6 -0
- package/lib/cim/components/modals/EditProxyModal.tsx +15 -3
- package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx +18 -13
- package/lib/common/components/clusterConfiguration/DownloadIso.tsx +3 -1
- package/lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx +4 -1
- 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 +31 -41
- package/lib/common/components/hosts/TableToolbar.tsx +3 -3
- 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 +28 -23
- package/lib/common/components/ui/formik/CodeField.tsx +1 -1
- package/lib/common/components/ui/formik/SelectField.tsx +1 -1
- package/lib/common/components/ui/formik/UploadField.tsx +2 -3
- package/lib/common/components/ui/formik/types.ts +2 -1
- package/lib/common/components/ui/formik/validationSchemas.test.ts +6 -0
- package/lib/common/components/ui/formik/validationSchemas.ts +33 -15
- package/lib/common/config/constants.ts +6 -2
- package/lib/common/types/events.ts +10 -3
- 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/types.ts +6 -0
- package/lib/ocm/components/HostsClusterDetailTab/utils.ts +43 -37
- 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/manifestsConfiguration/components/CustomManifestsForm.tsx +69 -32
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.tsx +3 -14
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/customManifestsValidationSchema.tsx +59 -24
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +29 -8
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +11 -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 +14 -2
- package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx +11 -2
- package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx +20 -2
- package/lib/ocm/components/clusterWizard/wizardTransition.ts +13 -1
- package/lib/ocm/components/clusters/ClusterPage.tsx +19 -5
- package/lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx +8 -2
- package/lib/ocm/components/fetching/fetchEvents.ts +31 -5
- package/lib/ocm/components/newFeatureSupportLevels/NewFeatureSupportLevelProvider.tsx +8 -2
- package/lib/ocm/hooks/useClusterCustomManifests.ts +9 -3
- 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/ClustersService.ts +2 -2
- 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
|
@@ -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,10 @@ 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)
|
|
54
|
+
? cluster.cpuArchitecture
|
|
55
|
+
: CpuArchitecture.USE_DAY1_ARCHITECTURE, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
53
56
|
const fetcher = () => FeatureSupportLevelsAPI.list().then((res) => res.data);
|
|
54
57
|
const { data: featureSupportLevels, error } = useSWR(FeatureSupportLevelsAPI.makeBaseURI(), fetcher, { errorRetryCount: 0, revalidateOnFocus: false });
|
|
55
58
|
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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"}
|
|
@@ -7,17 +7,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import { EVENT_SEVERITIES } from '../../../common';
|
|
10
11
|
import { handleApiError } from '../../api';
|
|
11
12
|
import { EventsAPI } from '../../services/apis';
|
|
13
|
+
const parseHeaders = (headers) => {
|
|
14
|
+
const severities = {
|
|
15
|
+
error: 0,
|
|
16
|
+
info: 0,
|
|
17
|
+
warning: 0,
|
|
18
|
+
critical: 0,
|
|
19
|
+
};
|
|
20
|
+
EVENT_SEVERITIES.forEach((severity) => {
|
|
21
|
+
const count = Number(headers[`severity-count-${severity}`]);
|
|
22
|
+
severities[severity] = count;
|
|
23
|
+
});
|
|
24
|
+
return {
|
|
25
|
+
totalEvents: Number(headers['event-count']),
|
|
26
|
+
severities: severities,
|
|
27
|
+
};
|
|
28
|
+
};
|
|
12
29
|
export const onFetchEvents = (props, onSuccess, onError) => __awaiter(void 0, void 0, void 0, function* () {
|
|
13
30
|
try {
|
|
31
|
+
EventsAPI.abort();
|
|
14
32
|
const response = yield EventsAPI.list(props);
|
|
15
|
-
onSuccess(response);
|
|
33
|
+
onSuccess(Object.assign({ data: response.data }, parseHeaders(response.headers)));
|
|
16
34
|
}
|
|
17
35
|
catch (error) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
36
|
+
const { code } = error;
|
|
37
|
+
if (!code || code !== 'ERR_CANCELED') {
|
|
38
|
+
handleApiError(error, () => {
|
|
39
|
+
onError('Failed to load events');
|
|
40
|
+
});
|
|
41
|
+
}
|
|
21
42
|
}
|
|
22
43
|
});
|
|
23
44
|
//# sourceMappingURL=fetchEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAA8B,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,MAAM,YAAY,GAAG,CAAC,OAA6B,EAAE,EAAE;IACrD,MAAM,UAAU,GAAsC;QACpD,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACZ,CAAC;IACF,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5D,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,UAAU,EAAE,UAAgC;KAC7C,CAAC;AACJ,CAAC,CAAC;AAEF,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,iBACP,IAAI,EAAE,QAAQ,CAAC,IAAI,IAChB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EACjC,CAAC;KACJ;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,10 @@ 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)
|
|
15
|
+
? cluster.cpuArchitecture
|
|
16
|
+
: CpuArchitecture.USE_DAY1_ARCHITECTURE, cluster === null || cluster === void 0 ? void 0 : cluster.name, pullSecret, cluster === null || cluster === void 0 ? void 0 : cluster.openshiftVersion);
|
|
14
17
|
const featureSupportLevels = useSupportLevelsAPI('features', openshiftVersion, cpuArchitecture);
|
|
15
18
|
const supportLevelData = React.useMemo(() => {
|
|
16
19
|
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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"}
|
|
@@ -46,7 +46,7 @@ const getManifestsInfo = (customManifests, clusterId) => __awaiter(void 0, void
|
|
|
46
46
|
}
|
|
47
47
|
return manifestsExtended;
|
|
48
48
|
});
|
|
49
|
-
const useClusterCustomManifests = (clusterId, extendedVersion) => {
|
|
49
|
+
const useClusterCustomManifests = (clusterId, extendedVersion, refresh = true) => {
|
|
50
50
|
const [customManifests, setCustomManifests] = React.useState();
|
|
51
51
|
const [error, setError] = React.useState('');
|
|
52
52
|
const [extendedManifestsLoaded, setExtendedManifestsLoaded] = React.useState(false);
|
|
@@ -80,8 +80,10 @@ const useClusterCustomManifests = (clusterId, extendedVersion) => {
|
|
|
80
80
|
}
|
|
81
81
|
}), [clusterId, extendedVersion]);
|
|
82
82
|
React.useEffect(() => {
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
if (refresh) {
|
|
84
|
+
void fetchCustomManifests();
|
|
85
|
+
}
|
|
86
|
+
}, [fetchCustomManifests, refresh]);
|
|
85
87
|
return {
|
|
86
88
|
customManifests,
|
|
87
89
|
error,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useClusterCustomManifests.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useClusterCustomManifests.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC;AAEzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAU,EAAmB,EAAE;IACjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,EAAE;;YAC9B,MAAM,OAAO,GAAG,MAAA,WAAW,CAAC,MAAM,0CAAE,MAAM,CAAC;YAC3C,OAAO,CAAC,OAAiB,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAO,eAA8B,EAAE,SAAiB,EAAE,EAAE;IACnF,MAAM,iBAAiB,GAA0B,EAAE,CAAC;IACpD,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;QACtC,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAChE,SAAS,EACT,QAAQ,CAAC,MAAM,IAAI,WAAW,EAC9B,QAAQ,CAAC,QAAQ,IAAI,EAAE,CACxB,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC1D,iBAAiB,CAAC,IAAI,CAAC;gBACrB,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,WAAW;gBACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;gBACjC,WAAW,EAAE,UAAU;aACxB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB,CAAC,IAAI,CAAC;gBACrB,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,WAAW;gBACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,EAAE;gBACjC,WAAW,EAAE,EAAE;aAChB,CAAC,CAAC;SACJ;KACF;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAA,CAAC;AAEF,MAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"useClusterCustomManifests.js","sourceRoot":"","sources":["../../../lib/ocm/hooks/useClusterCustomManifests.ts"],"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"}
|
|
@@ -91,7 +91,7 @@ const ClustersService = {
|
|
|
91
91
|
return {
|
|
92
92
|
folder: manifest.folder,
|
|
93
93
|
fileName: manifest.filename,
|
|
94
|
-
content:
|
|
94
|
+
content: window.btoa(manifest.manifestYaml),
|
|
95
95
|
};
|
|
96
96
|
},
|
|
97
97
|
getUpdateManifestParams(existingManifest, updatedManifest) {
|
|
@@ -100,7 +100,7 @@ const ClustersService = {
|
|
|
100
100
|
fileName: existingManifest.filename,
|
|
101
101
|
updatedFolder: updatedManifest.folder,
|
|
102
102
|
updatedFileName: updatedManifest.filename,
|
|
103
|
-
updatedContent:
|
|
103
|
+
updatedContent: window.btoa(updatedManifest.manifestYaml),
|
|
104
104
|
};
|
|
105
105
|
},
|
|
106
106
|
createClusterManifests(manifests, clusterId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
};
|
|
@@ -301,7 +301,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
|
|
|
301
301
|
name="nmState"
|
|
302
302
|
language={Language.yaml}
|
|
303
303
|
description={t(
|
|
304
|
-
'ai:Upload a YAML file in NMstate format that includes your network configuration (static IPs, bonds, etc.).',
|
|
304
|
+
'ai:Upload a YAML file in NMstate format (not the entire NMstate config CR) that includes your network configuration (static IPs, bonds, etc.).',
|
|
305
305
|
)}
|
|
306
306
|
/>
|
|
307
307
|
<MacMapping />
|