@openshift-assisted/ui-lib 2.52.1 → 2.53.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentWizard.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentWizard.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.d.ts +5 -0
- package/build/@types/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.d.ts.map +1 -0
- package/build/@types/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/types.d.ts +0 -1
- package/build/@types/cim/components/ClusterDeployment/types.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts +4 -4
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/wizardTransition.d.ts.map +1 -1
- package/build/@types/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/clusterDeployment.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +2 -2
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.test.d.ts +2 -0
- package/build/@types/cim/components/helpers/versions.test.d.ts.map +1 -0
- package/build/@types/cim/components/modals/CimConfiguration/CimConfigurationModal.d.ts.map +1 -1
- package/build/@types/cim/components/modals/CimConfiguration/persist.d.ts +14 -17
- package/build/@types/cim/components/modals/CimConfiguration/persist.d.ts.map +1 -1
- package/build/@types/cim/hooks/index.d.ts +1 -0
- package/build/@types/cim/hooks/index.d.ts.map +1 -1
- package/build/@types/cim/hooks/useAgents.d.ts +4 -0
- package/build/@types/cim/hooks/useAgents.d.ts.map +1 -0
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/ClusterCredentials.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/ConsoleModal.d.ts +0 -5
- package/build/@types/common/components/clusterDetail/ConsoleModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/customManifests/CustomManifestsAlert.d.ts +6 -0
- package/build/@types/common/components/clusterWizard/customManifests/CustomManifestsAlert.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/customManifests/index.d.ts +2 -0
- package/build/@types/common/components/clusterWizard/customManifests/index.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/index.d.ts +2 -0
- package/build/@types/common/components/clusterWizard/index.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.d.ts +3 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.d.ts.map +1 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/index.d.ts +1 -0
- package/build/@types/common/components/clusterWizard/networkingSteps/index.d.ts.map +1 -1
- package/build/@types/common/components/clusters/PullSecret.d.ts +0 -1
- package/build/@types/common/components/clusters/PullSecret.d.ts.map +1 -1
- package/build/@types/common/components/hosts/HostsTable.d.ts.map +1 -1
- package/build/@types/common/components/ui/WizardFooter.d.ts +1 -0
- package/build/@types/common/components/ui/WizardFooter.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/utils.d.ts +1 -0
- package/build/@types/common/components/ui/formik/utils.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts +2 -2
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/common/types/networkType.d.ts +2 -1
- package/build/@types/common/types/networkType.d.ts.map +1 -1
- package/build/@types/common/validationSchemas/networkingValidation.d.ts +10 -0
- package/build/@types/common/validationSchemas/networkingValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/review/ReviewSummary.d.ts.map +1 -1
- package/build/@types/ocm/components/{clusterDetail/ClusterProperties.d.ts → clusterConfiguration/review/utils.d.ts} +1 -8
- package/build/@types/ocm/components/clusterConfiguration/review/utils.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterConfiguration/review/utils.test.d.ts +2 -0
- package/build/@types/ocm/components/clusterConfiguration/review/utils.test.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateTypes.d.ts +1 -0
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateTypes.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.d.ts +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterDetailsButtonGroup.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/index.d.ts +0 -1
- package/build/@types/ocm/components/clusterDetail/index.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetailsForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/HostDiscovery.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/AssistedInstallerHeader.d.ts +5 -1
- package/build/@types/ocm/components/clusters/AssistedInstallerHeader.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/ClustersTable.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/HostsTableEmptyState.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useClusterCustomManifests.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useLateBinding.d.ts.map +1 -1
- package/build/@types/ocm/hooks/useUISettings.d.ts.map +1 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts +2 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentWizard.js +9 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentWizard.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js +46 -7
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js +22 -21
- package/build/cjs/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js +25 -9
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js +35 -0
- package/build/cjs/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.js.map +1 -0
- package/build/cjs/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.js +4 -4
- package/build/cjs/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js +13 -18
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/wizardTransition.js +5 -1
- package/build/cjs/cim/components/ClusterDeployment/wizardTransition.js.map +1 -1
- package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js +1 -1
- package/build/cjs/cim/components/Hypershift/modals/NodePoolForm.js.map +1 -1
- package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js +1 -4
- package/build/cjs/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.js.map +1 -1
- package/build/cjs/cim/components/helpers/clusterDeployment.js +14 -10
- package/build/cjs/cim/components/helpers/clusterDeployment.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +39 -28
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.test.js +423 -0
- package/build/cjs/cim/components/helpers/versions.test.js.map +1 -0
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js +39 -16
- package/build/cjs/cim/components/modals/CimConfiguration/CimConfigurationModal.js.map +1 -1
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js +96 -136
- package/build/cjs/cim/components/modals/CimConfiguration/persist.js.map +1 -1
- package/build/cjs/cim/hooks/index.js +1 -0
- package/build/cjs/cim/hooks/index.js.map +1 -1
- package/build/cjs/cim/hooks/useAgents.js +13 -0
- package/build/cjs/cim/hooks/useAgents.js.map +1 -0
- package/build/cjs/common/components/clusterDetail/ClusterCredentials.js +10 -9
- package/build/cjs/common/components/clusterDetail/ClusterCredentials.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/ConsoleModal.js +1 -10
- package/build/cjs/common/components/clusterDetail/ConsoleModal.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/customManifests/CustomManifestsAlert.js +32 -0
- package/build/cjs/common/components/clusterWizard/customManifests/CustomManifestsAlert.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/customManifests/index.js +5 -0
- package/build/cjs/common/components/clusterWizard/customManifests/index.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/index.js +2 -0
- package/build/cjs/common/components/clusterWizard/index.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js +8 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.js +2 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js +29 -19
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.js +20 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.js.map +1 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/index.js +1 -0
- package/build/cjs/common/components/clusterWizard/networkingSteps/index.js.map +1 -1
- package/build/cjs/common/components/clusters/PullSecret.js +17 -19
- package/build/cjs/common/components/clusters/PullSecret.js.map +1 -1
- package/build/cjs/common/components/hosts/HostsTable.js +2 -1
- package/build/cjs/common/components/hosts/HostsTable.js.map +1 -1
- package/build/cjs/common/components/ui/WizardFooter.js +6 -1
- package/build/cjs/common/components/ui/WizardFooter.js.map +1 -1
- package/build/cjs/common/components/ui/formik/utils.js +5 -1
- package/build/cjs/common/components/ui/formik/utils.js.map +1 -1
- package/build/cjs/common/config/constants.js +13 -2
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/types/networkType.js +9 -8
- package/build/cjs/common/types/networkType.js.map +1 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js +19 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js +4 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.js +1 -20
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +7 -6
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.js +6 -9
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +4 -4
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js +6 -5
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewSummary.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js +57 -0
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.js.map +1 -0
- package/build/cjs/ocm/components/{clusterDetail/ClusterProperties.test.js → clusterConfiguration/review/utils.test.js} +13 -13
- package/build/cjs/ocm/components/clusterConfiguration/review/utils.test.js.map +1 -0
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/nmstateTypes.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.js +3 -7
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailsButtonGroup.js +8 -2
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailsButtonGroup.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/index.js +1 -3
- package/build/cjs/ocm/components/clusterDetail/index.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js +10 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetailsForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/HostDiscovery.js +4 -1
- package/build/cjs/ocm/components/clusterWizard/HostDiscovery.js.map +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js +2 -2
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClustersTable.js +3 -2
- package/build/cjs/ocm/components/clusters/ClustersTable.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js +1 -1
- package/build/cjs/ocm/components/hosts/HostsTableEmptyState.js +2 -1
- package/build/cjs/ocm/components/hosts/HostsTableEmptyState.js.map +1 -1
- package/build/cjs/ocm/hooks/useClusterCustomManifests.js +3 -15
- package/build/cjs/ocm/hooks/useClusterCustomManifests.js.map +1 -1
- package/build/cjs/ocm/hooks/useLateBinding.js +41 -26
- package/build/cjs/ocm/hooks/useLateBinding.js.map +1 -1
- package/build/cjs/ocm/hooks/usePullSecret.js +2 -2
- package/build/cjs/ocm/hooks/useUISettings.js +1 -1
- package/build/cjs/ocm/hooks/useUISettings.js.map +1 -1
- package/build/cjs/ocm/services/ClusterDetailsService.js +4 -2
- package/build/cjs/ocm/services/ClusterDetailsService.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizard.tsx +10 -2
- package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx +55 -6
- package/lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx +18 -2
- package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts +22 -8
- package/lib/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.tsx +81 -0
- package/lib/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.tsx +18 -14
- package/lib/cim/components/ClusterDeployment/types.ts +0 -1
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +14 -22
- package/lib/cim/components/ClusterDeployment/wizardTransition.ts +5 -1
- package/lib/cim/components/Hypershift/modals/NodePoolForm.tsx +2 -2
- package/lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx +2 -5
- package/lib/cim/components/helpers/clusterDeployment.ts +9 -4
- package/lib/cim/components/helpers/versions.test.ts +465 -0
- package/lib/cim/components/helpers/versions.ts +37 -31
- package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx +45 -18
- package/lib/cim/components/modals/CimConfiguration/persist.ts +97 -199
- package/lib/cim/hooks/index.tsx +1 -0
- package/lib/cim/hooks/useAgents.tsx +15 -0
- package/lib/cim/types/k8s/agent-cluster-install.ts +1 -1
- package/lib/common/components/clusterDetail/ClusterCredentials.tsx +49 -53
- package/lib/common/components/clusterDetail/ConsoleModal.tsx +0 -35
- package/lib/common/components/clusterWizard/customManifests/CustomManifestsAlert.tsx +39 -0
- package/lib/common/components/clusterWizard/customManifests/index.tsx +1 -0
- package/lib/common/components/clusterWizard/index.ts +2 -0
- package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx +8 -1
- package/lib/common/components/clusterWizard/networkingSteps/ManagedNetworkingControlGroup.tsx +2 -2
- package/lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx +36 -26
- package/lib/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.tsx +28 -0
- package/lib/common/components/clusterWizard/networkingSteps/index.ts +1 -0
- package/lib/common/components/clusters/PullSecret.tsx +28 -38
- package/lib/common/components/hosts/HostsTable.tsx +2 -0
- package/lib/common/components/ui/WizardFooter.tsx +10 -0
- package/lib/common/components/ui/formik/utils.ts +6 -0
- package/lib/common/config/constants.ts +14 -1
- package/lib/common/types/networkType.ts +9 -8
- package/lib/common/validationSchemas/networkingValidation.tsx +39 -1
- package/lib/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx +6 -3
- package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx +7 -6
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx +10 -45
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +11 -9
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.tsx +7 -24
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -5
- package/lib/ocm/components/clusterConfiguration/review/ReviewClusterDetailTable.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx +10 -4
- package/lib/ocm/components/clusterConfiguration/review/ReviewSummary.tsx +9 -2
- package/lib/ocm/components/{clusterDetail/ClusterProperties.test.ts → clusterConfiguration/review/utils.test.ts} +1 -1
- package/lib/ocm/components/clusterConfiguration/review/utils.tsx +61 -0
- package/lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts +2 -0
- package/lib/ocm/components/clusterConfiguration/staticIp/data/nmstateTypes.ts +1 -0
- package/lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts +2 -0
- package/lib/ocm/components/clusterDetail/ClusterDetailsButtonGroup.tsx +27 -2
- package/lib/ocm/components/clusterDetail/index.ts +0 -1
- package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx +10 -1
- package/lib/ocm/components/clusterWizard/HostDiscovery.tsx +4 -0
- package/lib/ocm/components/clusters/AssistedInstallerHeader.tsx +6 -2
- package/lib/ocm/components/clusters/ClusterPage.tsx +1 -1
- package/lib/ocm/components/clusters/ClustersTable.tsx +59 -49
- package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts +1 -1
- package/lib/ocm/components/hosts/HostsTableEmptyState.tsx +2 -0
- package/lib/ocm/hooks/useClusterCustomManifests.ts +3 -0
- package/lib/ocm/hooks/useLateBinding.ts +45 -24
- package/lib/ocm/hooks/usePullSecret.ts +2 -2
- package/lib/ocm/hooks/useUISettings.ts +3 -1
- package/lib/ocm/services/ClusterDetailsService.ts +6 -0
- package/package.json +9 -9
- package/build/@types/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.d.ts +0 -7
- package/build/@types/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts +0 -8
- package/build/@types/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts +0 -2
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts.map +0 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js +0 -33
- package/build/cjs/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js +0 -40
- package/build/cjs/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js +0 -77
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js.map +0 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js.map +0 -1
- package/lib/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.tsx +0 -74
- package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx +0 -69
- package/lib/ocm/components/clusterDetail/ClusterProperties.tsx +0 -169
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NetworkTypeDropDown = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
|
+
const formik_1 = require("formik");
|
|
7
|
+
const react_core_1 = require("@patternfly/react-core");
|
|
8
|
+
const ui_1 = require("../../../../common/components/ui");
|
|
9
|
+
const networkType_1 = require("../../../../common/types/networkType");
|
|
10
|
+
const hooks_1 = require("../../../../common/hooks");
|
|
11
|
+
const common_1 = require("../../../../common");
|
|
12
|
+
const NetworkTypeDropDown = ({ isSDNSelectable }) => {
|
|
13
|
+
const { t } = (0, hooks_1.useTranslation)();
|
|
14
|
+
const [field, , { setValue }] = (0, formik_1.useField)('networkType');
|
|
15
|
+
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
16
|
+
const { values } = (0, formik_1.useFormikContext)();
|
|
17
|
+
const fieldId = (0, ui_1.getFieldId)('networkType', 'input');
|
|
18
|
+
const showThirdPartyBanner = (0, networkType_1.isThirdPartyCNI)(values.networkType);
|
|
19
|
+
const currentDisplayValue = (0, networkType_1.NETWORK_TYPE_LABELS)(t)[field.value];
|
|
20
|
+
const dropdownItems = Object.entries((0, networkType_1.NETWORK_TYPE_LABELS)(t)).map(([value, label]) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, value: value, isAriaDisabled: value === networkType_1.NETWORK_TYPE_SDN && !isSDNSelectable }, label)));
|
|
21
|
+
const onSelect = (_event, nextValue) => {
|
|
22
|
+
if (nextValue) {
|
|
23
|
+
setValue(nextValue);
|
|
24
|
+
}
|
|
25
|
+
setOpen(false);
|
|
26
|
+
};
|
|
27
|
+
const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, currentDisplayValue || t('ai:Network type')));
|
|
28
|
+
return (react_1.default.createElement(react_core_1.Stack, { hasGutter: true },
|
|
29
|
+
react_1.default.createElement(react_core_1.StackItem, null,
|
|
30
|
+
react_1.default.createElement(react_core_1.FormGroup, { fieldId: fieldId, label: t('ai:Network type'), id: `form-control__${fieldId}` },
|
|
31
|
+
react_1.default.createElement(react_core_1.Dropdown, { id: `${fieldId}-dropdown`, onOpenChange: (open) => setOpen(open), onSelect: onSelect, toggle: toggle, isOpen: isOpen }, dropdownItems))),
|
|
32
|
+
showThirdPartyBanner && react_1.default.createElement(common_1.ThirdPartyCNIBanner, null)));
|
|
33
|
+
};
|
|
34
|
+
exports.NetworkTypeDropDown = NetworkTypeDropDown;
|
|
35
|
+
//# sourceMappingURL=NetworkTypeDropdown.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NetworkTypeDropdown.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,mCAAoD;AACpD,uDAQgC;AAChC,yDAA8D;AAE9D,sEAI8C;AAC9C,oDAA0D;AAC1D,+CAAyD;AAElD,MAAM,mBAAmB,GAAG,CAAC,EAAE,eAAe,EAAgC,EAAE,EAAE;IACvF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,sBAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,aAAa,CAAC,CAAC;IAChE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAClE,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAEnD,MAAM,oBAAoB,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,iCAAmB,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,iCAAmB,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CACnF,8BAAC,yBAAY,IACX,GAAG,EAAE,KAAK,EACV,EAAE,EAAE,KAAK,EACT,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,KAAK,KAAK,8BAAgB,IAAI,CAAC,eAAe,IAE7D,KAAK,CACO,CAChB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,CAAC,MAA8C,EAAE,SAAkB,EAAQ,EAAE;QAC5F,IAAI,SAAS,EAAE,CAAC;YACd,QAAQ,CAAC,SAAS,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAC1D,8BAAC,uBAAU,IACT,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,OAAO,EACX,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAE1B,mBAAmB,IAAI,CAAC,CAAC,iBAAiB,CAAC,CACjC,CACd,CAAC;IAEF,OAAO,CACL,8BAAC,kBAAK,IAAC,SAAS;QACd,8BAAC,sBAAS;YACR,8BAAC,sBAAS,IAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,iBAAiB,OAAO,EAAE;gBACtF,8BAAC,qBAAQ,IACP,EAAE,EAAE,GAAG,OAAO,WAAW,EACzB,YAAY,EAAE,CAAC,IAAa,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC9C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,IAEb,aAAa,CACL,CACD,CACF;QACX,oBAAoB,IAAI,8BAAC,4BAAmB,OAAG,CAC1C,CACT,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,mBAAmB,uBA2D9B"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ClusterDeploymentReviewStep = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const react_core_1 = require("@patternfly/react-core");
|
|
6
5
|
const React = tslib_1.__importStar(require("react"));
|
|
6
|
+
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const wizardTransition_1 = require("../wizardTransition");
|
|
8
8
|
const common_1 = require("../../../../common");
|
|
9
9
|
const helpers_1 = require("../../helpers");
|
|
@@ -26,7 +26,7 @@ const ClusterDeploymentReviewStep = ({ agentClusterInstall, agents, onFinish, cl
|
|
|
26
26
|
const clusterAgents = React.useMemo(() => agents.filter((a) => (0, helpers_2.isAgentOfCluster)(a, cdName, cdNamespace)), [agents, cdName, cdNamespace]);
|
|
27
27
|
const canContinue = (0, wizardTransition_1.canNextFromReviewStep)(agentClusterInstall, clusterAgents);
|
|
28
28
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
29
|
-
const onNext = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
29
|
+
const onNext = React.useCallback(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
30
30
|
clearAlerts();
|
|
31
31
|
setSubmitting(true);
|
|
32
32
|
try {
|
|
@@ -39,8 +39,8 @@ const ClusterDeploymentReviewStep = ({ agentClusterInstall, agents, onFinish, cl
|
|
|
39
39
|
finally {
|
|
40
40
|
setSubmitting(false);
|
|
41
41
|
}
|
|
42
|
-
});
|
|
43
|
-
const footer = (React.createElement(react_core_1.WizardFooter, { activeStep: activeStep, onNext: onNext, isNextDisabled: isSubmitting || !canContinue || !!syncError, nextButtonText: t('ai:Install cluster'), nextButtonProps: { isLoading: isSubmitting }, onBack: goToPrevStep, onClose: close }));
|
|
42
|
+
}), [addAlert, clearAlerts, onFinish, t]);
|
|
43
|
+
const footer = React.useMemo(() => (React.createElement(react_core_1.WizardFooter, { activeStep: activeStep, onNext: onNext, isNextDisabled: isSubmitting || !canContinue || !!syncError, nextButtonText: t('ai:Install cluster'), nextButtonProps: { isLoading: isSubmitting }, onBack: goToPrevStep, onClose: close })), [activeStep, canContinue, close, goToPrevStep, isSubmitting, onNext, syncError, t]);
|
|
44
44
|
(0, react_core_1.useWizardFooter)(footer);
|
|
45
45
|
const openShiftVersion = (0, helpers_1.getSelectedVersion)(clusterImages, agentClusterInstall);
|
|
46
46
|
const platform = (0, common_1.getPlatforms)(t)[(((_d = (_c = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.spec) === null || _c === void 0 ? void 0 : _c.platformType) === null || _d === void 0 ? void 0 : _d.toLowerCase()) || 'baremetal')];
|
package/build/cjs/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDeploymentReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ClusterDeploymentReviewStep.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,24 +23,19 @@ const getInfraEnvProxy = (infraEnvs) => {
|
|
|
23
23
|
}),
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
-
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) =>
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
|
|
40
|
-
httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
|
|
41
|
-
httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }), // share the schema, httpS is currently not supported
|
|
42
|
-
noProxy: (0, common_2.noProxyValidationSchema)(t),
|
|
43
|
-
}));
|
|
26
|
+
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) => {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f;
|
|
28
|
+
return Yup.object().shape({
|
|
29
|
+
clusterNetworks: (0, common_2.clusterNetworksSchema)(t, (_a = values.stackType) !== null && _a !== void 0 ? _a : '', (_c = (_b = values.machineNetworks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.cidr, openshiftVersion),
|
|
30
|
+
serviceNetworks: (0, common_2.serviceNetworksSchema)(t, (_d = values.stackType) !== null && _d !== void 0 ? _d : '', (_f = (_e = values.machineNetworks) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.cidr, openshiftVersion),
|
|
31
|
+
apiVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
32
|
+
ingressVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
33
|
+
sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
|
|
34
|
+
httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
|
|
35
|
+
httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }), // share the schema, httpS is currently not supported
|
|
36
|
+
noProxy: (0, common_2.noProxyValidationSchema)(t),
|
|
37
|
+
});
|
|
38
|
+
});
|
|
44
39
|
const useNetworkingFormik = ({ clusterDeployment, agentClusterInstall, agents, }) => {
|
|
45
40
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
46
41
|
const initialValues = react_1.default.useMemo(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAG3B,sCAA4D;AAC5D,iFAAuF;AACvF,qFAA2E;AAO3E,wCAA0C;AAC1C,iDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAG3B,sCAA4D;AAC5D,iFAAuF;AACvF,qFAA2E;AAO3E,wCAA0C;AAC1C,iDAA8D;AAC9D,4CASyB;AAEzB,2FAA+E;AAE/E,MAAM,gBAAgB,GAAG,CAAC,SAAgC,EAAE,EAAE;IAC5D,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CACtC,CAAC,EAAE,EAAE,EAAE,+BAAC,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,MAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA,KAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA,EAAA,CAC3F,CAAC;IACF,OAAO;QACL,iBAAiB;QACjB,WAAW,EAAE,SAAS,CAAC,KAAK,CAC1B,CAAC,EAAE,EAAE,EAAE;;YACL,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,SAAS,CAAA;gBACvE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA;gBACzE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA;SAAA,CACtE;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uCAAuC,GAAG,CAC9C,aAAgD,EAChD,WAAwB,EACxB,CAAY,EACZ,gBAAyB,EACzB,EAAE,CACF,GAAG,CAAC,IAAI,CAAC,CAAC,MAAyC,EAAE,EAAE;;IACrD,OAAA,GAAG,CAAC,MAAM,EAAqC,CAAC,KAAK,CAAC;QACpD,eAAe,EAAE,IAAA,8BAAqB,EACpC,CAAC,EACD,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,EACtB,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,EACjC,gBAAgB,CACjB;QACD,eAAe,EAAE,IAAA,8BAAqB,EACpC,CAAC,EACD,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,EACtB,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,EACjC,gBAAgB,CACjB;QACD,OAAO,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QACzD,WAAW,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7D,YAAY,EAAE,IAAA,yCAAgC,EAAC,CAAC,CAAC;QACjD,SAAS,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QAChF,UAAU,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,qDAAqD;QACvI,OAAO,EAAE,IAAA,gCAAuB,EAAC,CAAC,CAAC;KACpC,CAAC,CAAA;CAAA,CACH,CAAC;AAQG,MAAM,mBAAmB,GAAG,CAAC,EAClC,iBAAiB,EACjB,mBAAmB,EACnB,MAAM,GACkB,EAAE,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CACjC,GAAG,EAAE;QACH,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC;YAC3B,iBAAiB;YACjB,mBAAmB;YACnB,MAAM;SACP,CAAC,CAAC;QACH,uCACK,IAAA,wDAAuB,EAAC,OAAO,EAAE,yCAAgC,CAAC,KACrE,WAAW,EAAE,KAAK,EAClB,SAAS,EAAE,KAAK,IAChB;IACJ,CAAC,EACD,EAAE,CACH,CAAC;IACF,MAAM,gBAAgB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC;YAC3B,iBAAiB;YACjB,mBAAmB;YACnB,MAAM;SACP,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,uCAAuC,CAC5C,aAAa,EACb,WAAW,EACX,CAAC,EACD,OAAO,CAAC,gBAAgB,CACzB,CAAC;IACJ,CAAC,EAAE,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAEvE,OAAO;QACL,aAAa;QACb,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,mBAAmB,uBAwC9B;AAOK,MAAM,kBAAkB,GAAG,CAAC,EAAE,MAAM,EAAE,aAAa,EAA0B,EAAE,EAAE;IACtF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAyB,CAAC;IAC1E,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IACrE,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAE7E,MAAM,iBAAiB,GAAG,MAAM;SAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QAAC,OAAA,CAAC;YACX,IAAI,EAAE,MAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,0CAAG,wCAA+B,CAAC;YAC3D,SAAS,EAAE,MAAA,CAAC,CAAC,QAAQ,0CAAE,SAAS;SACjC,CAAC,CAAA;KAAA,CAAC;SACF,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,CAAC;SACvC,IAAI,EAA2C,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,6BAAqB,EAAC,iBAAiB,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,KAAK,GAAG,GAAS,EAAE;YACvB,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YACzF,IAAI,CAAC;gBACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC5D,YAAY,CAAC,eAAe,CAAC,CAAC;YAChC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,CAAU,CAAC;gBACzB,iBAAiB,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC,CAAA,CAAC;QAEF,KAAK,KAAK,EAAE,CAAC;IACf,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;IAEvE,OAAO;QACL,iBAAiB;QACjB,WAAW;QACX,cAAc;QACd,gBAAgB,EAAE,CAAC,SAAS;KAC7B,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,kBAAkB,sBAsC7B"}
|
|
@@ -51,7 +51,11 @@ const networkingStepValidationsMap = {
|
|
|
51
51
|
// Alternatively we would have to whitelist network validations instead of using group
|
|
52
52
|
// TODO(mlibra): remove that container-images-available from soft validations and let backend drive it via disabling it.
|
|
53
53
|
// Depends on: https://issues.redhat.com/browse/MGMT-5265
|
|
54
|
-
softValidationIds: [
|
|
54
|
+
softValidationIds: [
|
|
55
|
+
'ntp-synced',
|
|
56
|
+
'container-images-available',
|
|
57
|
+
'custom-manifests-requirements-satisfied',
|
|
58
|
+
],
|
|
55
59
|
getPageURL: (host, validationID) => {
|
|
56
60
|
if (validationID === 'ntp-synced') {
|
|
57
61
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizardTransition.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/wizardTransition.ts"],"names":[],"mappings":";;;AACA,wGAKuE;AAcvE,MAAM,gCAAgC,GAA4B;IAChE,OAAO,EAAE;QACP,MAAM,EAAE,EAAE;QACV,aAAa,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC;KACzD;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,EAAE;QACnB,MAAM,EAAE,EAAE;QACV,aAAa,EAAE,EAAE;KAClB;IACD,iBAAiB,EAAE,EAAE;CACtB,CAAC;AAEF,MAAM,+BAA+B,GAA4B;IAC/D,OAAO,EAAE;QACP,MAAM,EAAE,EAAE;QACV,aAAa,EAAE;YACb,0BAA0B;YAC1B,4BAA4B;YAC5B,4BAA4B;YAC5B,4BAA4B;SAC7B;KACF;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC;QACvD,MAAM,EAAE,CAAC,UAAU,CAAC;QACpB,aAAa,EAAE;YACb,WAAW;YACX,4BAA4B;YAC5B,4BAA4B;YAC5B,4BAA4B;SAC7B;KACF;IACD,iBAAiB,EAAE,EAAE;CACtB,CAAC;AAEF,MAAM,4BAA4B,GAA4B;IAC5D,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,SAAS,CAAC;QACnB,aAAa,EAAE,EAAE;KAClB;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;QACtC,MAAM,EAAE,CAAC,SAAS,CAAC;QACnB,aAAa,EAAE,EAAE;KAClB;IACD,sHAAsH;IACtH,0FAA0F;IAC1F,sFAAsF;IACtF,wHAAwH;IACxH,2DAA2D;IAC3D,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"wizardTransition.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/wizardTransition.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const NodePoolForm = ({ agents, nodePool, hostedCluster, agentMachines }) => {
|
|
|
17
17
|
let maxAgents = 0;
|
|
18
18
|
const availableAgents = (0, helpers_1.getAgentsForSelection)(agents).filter((agent) => values.agentLabels.every(({ key, value }) => { var _a, _b; return ((_b = (_a = agent.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b[key]) === value; }) &&
|
|
19
19
|
!agent.spec.clusterDeploymentName);
|
|
20
|
-
const ocpVersion = (0, helpers_1.
|
|
20
|
+
const ocpVersion = (0, helpers_1.getVersionFromReleaseString)(hostedCluster.spec.release.image);
|
|
21
21
|
if (isEdit) {
|
|
22
22
|
const nodePoolAgents = (0, utils_1.getNodepoolAgents)(nodePool, agents, agentMachines, hostedCluster);
|
|
23
23
|
maxAgents =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/NodePoolForm.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAQgC;AAChC,mCAA0C;AAE1C,+CAAgD;AAChD,8FAAkF;AAElF,
|
|
1
|
+
{"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/NodePoolForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,8 @@ const ACMFeatureSupportLevelProvider = ({ children, clusterImages, isEditCluster
|
|
|
34
34
|
}, []);
|
|
35
35
|
const ocpVersions = (0, helpers_1.getOCPVersions)(clusterImages);
|
|
36
36
|
const getNormalizedVersion = react_1.default.useCallback((versionName) => {
|
|
37
|
-
var _a, _b;
|
|
38
37
|
const clusterImage = clusterImages.find((clusterImageSet) => { var _a; return ((_a = clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.name) === versionName; });
|
|
39
|
-
const version = (0, helpers_1.
|
|
40
|
-
((_b = clusterImage === null || clusterImage === void 0 ? void 0 : clusterImage.metadata) === null || _b === void 0 ? void 0 : _b.name) ||
|
|
41
|
-
'';
|
|
38
|
+
const version = (0, helpers_1.getVersionFromClusterImageSet)(clusterImage);
|
|
42
39
|
return (0, utils_1.getMajorMinorVersion)(version);
|
|
43
40
|
}, [clusterImages]);
|
|
44
41
|
const getVersionSupportLevelsMap = react_1.default.useCallback((versionName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACMFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../../lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx"],"names":[],"mappings":";;;;AAAA,0DAAiD;AACjD,4CAMyB;AAEzB,sDAAiE;AACjE,2DAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"ACMFeatureSupportLevelProvider.js","sourceRoot":"","sources":["../../../../../lib/cim/components/featureSupportLevels/ACMFeatureSupportLevelProvider.tsx"],"names":[],"mappings":";;;;AAAA,0DAAiD;AACjD,4CAMyB;AAEzB,sDAAiE;AACjE,2DAAmF;AACnF,wCAA2E;AAC3E,2FAA+E;AAE/E,iDAA6D;AAM7D,MAAM,0BAA0B,GAAG,GAA4B,EAAE;IAC/D,IAAI,CAAC;QACH,MAAM,uBAAuB,GAA4B,EAAE,CAAC;QAC5D,mCAAuB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxD,MAAM,eAAe,GAA4B,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC;YACpD,CAAC,CAAC,CAAC;YACH,uBAAuB,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,sBAAsB;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,8BAA8B,GAA6C,CAAC,EACvF,QAAQ,EACR,aAAa,EACb,iBAAiB,GAAG,KAAK,GAC1B,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,gBAAgB,GAA4B,eAAK,CAAC,OAAO,CAA0B,GAAG,EAAE;QAC5F,OAAO,0BAA0B,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,oBAAoB,GAAG,eAAK,CAAC,WAAW,CAC5C,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CACrC,CAAC,eAAe,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAI,MAAK,WAAW,CAAA,EAAA,CACpE,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,uCAA6B,EAAC,YAAY,CAAC,CAAC;QAC5D,OAAO,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IACvC,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,0BAA0B,GAC9B,eAAK,CAAC,WAAW,CACf,CAAC,WAAmB,EAAuC,EAAE;QAC3D,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,UAAU;YACf,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC;YAC9B,CAAC,CAAC;YACE,mCAAmC;aACpC,CAAC;IACR,CAAC,EACD,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CACzC,CAAC;IAEJ,yHAAyH;IACzH,MAAM,sBAAsB,GAC1B,eAAK,CAAC,WAAW,CACf,CAAC,WAAmB,EAAE,SAAoB,EAA4B,EAAE;QACtE,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;QACxE,OAAO,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,CAAC,EACD,CAAC,0BAA0B,CAAC,CAC7B,CAAC;IAEJ,MAAM,0BAA0B,GAAG,eAAK,CAAC,WAAW,CAClD,CAAC,WAAmB,EAAE,SAAoB,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpE,OAAO,IAAA,sCAAkB,EAAC,YAAY,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,sBAAsB,CAAC,CACzB,CAAC;IAEF,MAAM,yBAAyB,GAAG,eAAK,CAAC,WAAW,CACjD,CAAC,WAAmB,EAAE,SAAoB,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,0BAA0B,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACvE,OAAO,IAAA,4CAAwB,EAC7B,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,CAAC,CACF,CAAC;IACJ,CAAC,EACD,CAAC,0BAA0B,EAAE,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAChE,CAAC;IAEF,MAAM,iBAAiB,GAAG,eAAK,CAAC,WAAW,CACzC,CAAC,OAAe,EAAE,SAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,EAC1F,CAAC,yBAAyB,CAAC,CAC5B,CAAC;IAEF,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CAA0B,GAAG,EAAE;QAChE,OAAO;YACL,0BAA0B;YAC1B,sBAAsB;YACtB,iBAAiB;YACjB,wBAAwB,EAAE,yBAAyB;YACnD,kBAAkB,EAAE,0BAA0B;SAC/C,CAAC;IACJ,CAAC,EAAE;QACD,0BAA0B;QAC1B,sBAAsB;QACtB,iBAAiB;QACjB,yBAAyB;QACzB,0BAA0B;KAC3B,CAAC,CAAC;IAEH,OAAO,CACL,8BAAC,2CAAkC,IAAC,KAAK,EAAE,aAAa,IACrD,QAAQ,CAC0B,CACtC,CAAC;AACJ,CAAC,CAAC;AA/FW,QAAA,8BAA8B,kCA+FzC;AAEF,kBAAe,sCAA8B,CAAC"}
|
|
@@ -106,34 +106,38 @@ const getClusterApiUrl = (clusterDeployment, agentClusterInstall) => {
|
|
|
106
106
|
};
|
|
107
107
|
exports.getClusterApiUrl = getClusterApiUrl;
|
|
108
108
|
const getClusterProperties = (clusterDeployment, agentClusterInstall) => {
|
|
109
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
109
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
110
110
|
const serviceNetworks = (_b = (_a = agentClusterInstall.spec) === null || _a === void 0 ? void 0 : _a.networking) === null || _b === void 0 ? void 0 : _b.serviceNetwork;
|
|
111
111
|
const clusterNetworks = (_d = (_c = agentClusterInstall.spec) === null || _c === void 0 ? void 0 : _c.networking) === null || _d === void 0 ? void 0 : _d.clusterNetwork;
|
|
112
|
+
const apiIPs = ((_e = agentClusterInstall.spec) === null || _e === void 0 ? void 0 : _e.apiVIPs) || [(_f = agentClusterInstall.spec) === null || _f === void 0 ? void 0 : _f.apiVIP];
|
|
113
|
+
const ingressIPs = ((_g = agentClusterInstall.spec) === null || _g === void 0 ? void 0 : _g.ingressVIPs) || [
|
|
114
|
+
(_h = agentClusterInstall.spec) === null || _h === void 0 ? void 0 : _h.ingressVIP,
|
|
115
|
+
];
|
|
112
116
|
return {
|
|
113
117
|
// TODO: we should translate following keys since they are used "as it is" in AcmDescriptionList.tsx / List component of the stolostron project
|
|
114
118
|
name: {
|
|
115
119
|
key: 'Name',
|
|
116
|
-
value: (
|
|
120
|
+
value: (_j = clusterDeployment.metadata) === null || _j === void 0 ? void 0 : _j.name,
|
|
117
121
|
},
|
|
118
122
|
openshiftVersion: {
|
|
119
123
|
key: 'OpenShift version',
|
|
120
|
-
value: (
|
|
124
|
+
value: (_k = clusterDeployment.status) === null || _k === void 0 ? void 0 : _k.installVersion,
|
|
121
125
|
},
|
|
122
126
|
clusterId: {
|
|
123
127
|
key: 'Cluster ID',
|
|
124
|
-
value: (
|
|
128
|
+
value: (_l = clusterDeployment.metadata) === null || _l === void 0 ? void 0 : _l.uid,
|
|
125
129
|
},
|
|
126
130
|
baseDnsDomain: {
|
|
127
131
|
key: 'Base DNS domain',
|
|
128
|
-
value: (
|
|
132
|
+
value: (_m = clusterDeployment.spec) === null || _m === void 0 ? void 0 : _m.baseDomain,
|
|
129
133
|
},
|
|
130
134
|
apiVip: {
|
|
131
|
-
key: 'API IP',
|
|
132
|
-
value: (
|
|
135
|
+
key: apiIPs.length > 1 ? 'API IPs' : 'API IP',
|
|
136
|
+
value: apiIPs.join(', '),
|
|
133
137
|
},
|
|
134
138
|
ingressVip: {
|
|
135
|
-
key: 'Ingress IP',
|
|
136
|
-
value: (
|
|
139
|
+
key: ingressIPs.length > 1 ? 'Ingress IPs' : 'Ingress IP',
|
|
140
|
+
value: ingressIPs.join(', '),
|
|
137
141
|
},
|
|
138
142
|
clusterNetworkCidr: {
|
|
139
143
|
key: ((clusterNetworks === null || clusterNetworks === void 0 ? void 0 : clusterNetworks.length) || 0) > 1 ? 'Cluster network CIDRs' : 'Cluster network CIDR',
|
|
@@ -151,7 +155,7 @@ const getClusterProperties = (clusterDeployment, agentClusterInstall) => {
|
|
|
151
155
|
},
|
|
152
156
|
installedTimestamp: {
|
|
153
157
|
key: 'Installed at',
|
|
154
|
-
value: (0, common_1.getHumanizedDateTime)((
|
|
158
|
+
value: (0, common_1.getHumanizedDateTime)((_o = clusterDeployment.status) === null || _o === void 0 ? void 0 : _o.installedTimestamp),
|
|
155
159
|
},
|
|
156
160
|
};
|
|
157
161
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterDeployment.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"clusterDeployment.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/clusterDeployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,36 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNetworkType = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.
|
|
3
|
+
exports.getNetworkType = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.getVersionFromClusterImageSet = exports.getVersionFromReleaseString = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const uniqBy_js_1 = tslib_1.__importDefault(require("lodash-es/uniqBy.js"));
|
|
6
|
+
const common_1 = require("../../../common");
|
|
6
7
|
const utils_1 = require("../../../common/utils");
|
|
7
|
-
const
|
|
8
|
-
const match =
|
|
8
|
+
const getVersionFromReleaseString = (value = '') => {
|
|
9
|
+
const match = /(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(value);
|
|
9
10
|
if (match && match.length > 1 && match[1]) {
|
|
10
11
|
return match[1];
|
|
11
12
|
}
|
|
12
13
|
};
|
|
13
|
-
exports.
|
|
14
|
-
const
|
|
15
|
-
|
|
14
|
+
exports.getVersionFromReleaseString = getVersionFromReleaseString;
|
|
15
|
+
const getVersionFromClusterImageSet = (clusterImageSet) => {
|
|
16
|
+
var _a, _b, _c, _d;
|
|
17
|
+
return ((0, exports.getVersionFromReleaseString)((_b = (_a = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b['releaseTag']) ||
|
|
18
|
+
(0, exports.getVersionFromReleaseString)((_c = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.spec) === null || _c === void 0 ? void 0 : _c.releaseImage) ||
|
|
19
|
+
((_d = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _d === void 0 ? void 0 : _d.name) ||
|
|
20
|
+
'');
|
|
21
|
+
};
|
|
22
|
+
exports.getVersionFromClusterImageSet = getVersionFromClusterImageSet;
|
|
23
|
+
const getCPUArchFromReleaseString = (value = '') => {
|
|
24
|
+
const match = /(?:\d+\.)+\d+-(x86-64|[\w_]+)/gm.exec(value);
|
|
16
25
|
if (match && match.length > 1 && match[1]) {
|
|
17
26
|
return match[1];
|
|
18
27
|
}
|
|
19
28
|
};
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
const getCPUArchFromClusterImageSet = (clusterImageSet) => {
|
|
30
|
+
var _a, _b, _c, _d, _e, _f;
|
|
31
|
+
const cpuArch = ((_b = (_a = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.architecture) ||
|
|
32
|
+
getCPUArchFromReleaseString((_d = (_c = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _c === void 0 ? void 0 : _c.labels) === null || _d === void 0 ? void 0 : _d['releaseTag']) ||
|
|
33
|
+
getCPUArchFromReleaseString((_e = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.spec) === null || _e === void 0 ? void 0 : _e.releaseImage) ||
|
|
34
|
+
getCPUArchFromReleaseString((_f = clusterImageSet === null || clusterImageSet === void 0 ? void 0 : clusterImageSet.metadata) === null || _f === void 0 ? void 0 : _f.name) ||
|
|
35
|
+
'';
|
|
36
|
+
switch (cpuArch) {
|
|
37
|
+
case common_1.CpuArchitecture.x86:
|
|
38
|
+
case common_1.CpuArchitecture.ARM:
|
|
39
|
+
case common_1.CpuArchitecture.s390x:
|
|
40
|
+
case common_1.CpuArchitecture.MULTI:
|
|
41
|
+
return cpuArch;
|
|
42
|
+
case 'x86-64':
|
|
43
|
+
return common_1.CpuArchitecture.x86;
|
|
44
|
+
default:
|
|
45
|
+
return undefined;
|
|
30
46
|
}
|
|
31
|
-
return 'beta';
|
|
32
47
|
};
|
|
33
|
-
exports.supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
34
48
|
const isValidImageSet = (cis, architectures, extended) => {
|
|
35
49
|
var _a, _b;
|
|
36
50
|
if (!extended && ((_b = (_a = cis.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.visible) !== 'true') {
|
|
@@ -49,19 +63,15 @@ const extractMajorMinor = (version) => {
|
|
|
49
63
|
};
|
|
50
64
|
// Converts a ClusterImageSet to an OpenshiftVersionOptionType
|
|
51
65
|
const toVersionOption = (clusterImageSet) => {
|
|
52
|
-
var _a
|
|
53
|
-
const version = (0, exports.
|
|
54
|
-
|
|
55
|
-
'';
|
|
56
|
-
const cpuArch = getCPUArchFromReleaseImage((_c = clusterImageSet.spec) === null || _c === void 0 ? void 0 : _c.releaseImage);
|
|
66
|
+
var _a;
|
|
67
|
+
const version = (0, exports.getVersionFromClusterImageSet)(clusterImageSet);
|
|
68
|
+
const cpuArch = getCPUArchFromClusterImageSet(clusterImageSet);
|
|
57
69
|
return {
|
|
58
70
|
label: `OpenShift ${version}`,
|
|
59
71
|
version,
|
|
60
|
-
value: (
|
|
72
|
+
value: (_a = clusterImageSet.metadata) === null || _a === void 0 ? void 0 : _a.name,
|
|
61
73
|
default: false,
|
|
62
|
-
//
|
|
63
|
-
// supportLevel : getSupportLevelFromChannel(clusterImageSet.metadata?.labels?.channel)
|
|
64
|
-
supportLevel: 'production',
|
|
74
|
+
supportLevel: 'production', // ACM doesn't have feature support levels
|
|
65
75
|
cpuArchitectures: cpuArch ? [cpuArch] : undefined,
|
|
66
76
|
};
|
|
67
77
|
};
|
|
@@ -75,8 +85,9 @@ const hasMatchingOsImage = (version, osImageVersions) => {
|
|
|
75
85
|
return true;
|
|
76
86
|
return osImageVersions.includes(extractMajorMinor(version.version));
|
|
77
87
|
};
|
|
88
|
+
const supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
78
89
|
const getOCPVersions = (clusterImageSets, isNutanix, osImages, extended) => {
|
|
79
|
-
const architectures = isNutanix ?
|
|
90
|
+
const architectures = isNutanix ? supportedNutanixPlatforms : undefined;
|
|
80
91
|
const osImageVersions = [...new Set(osImages === null || osImages === void 0 ? void 0 : osImages.map((img) => img.openshiftVersion))];
|
|
81
92
|
const versions = clusterImageSets
|
|
82
93
|
.filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, architectures, extended))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":";;;;AAAA,4EAAyC;
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"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"}
|