@openshift-assisted/ui-lib 2.46.2 → 2.47.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/ClusterDeploymentHostsDiscovery.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentNetworkingForm.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/ClusterDetailsFormFields.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/EnvironmentDetails.d.ts.map +1 -1
- package/build/@types/cim/components/common/ResourceAlerts.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +1 -0
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/common/api/assisted-service/BundleAPI.d.ts +2 -2
- package/build/@types/common/api/assisted-service/ClustersAPI.d.ts +25 -25
- package/build/@types/common/api/assisted-service/ComponentVersionsAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/EventsAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/HostsAPI.d.ts +6 -6
- package/build/@types/common/api/assisted-service/InfraEnvsAPI.d.ts +7 -7
- package/build/@types/common/api/assisted-service/ManagedDomainsAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/NewFeatureSupportLevelsAPI.d.ts +2 -2
- package/build/@types/common/api/assisted-service/OperatorsAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/SupportedOpenshiftVersionsAPI.d.ts +1 -1
- package/build/@types/common/api/assisted-service/UISettingsAPI.d.ts +2 -2
- package/build/@types/common/components/clusterConfiguration/ControlPlaneNodesDropdown.d.ts +2 -1
- package/build/@types/common/components/clusterConfiguration/ControlPlaneNodesDropdown.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiscoveryImageConfigForm.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DownloadIpxeScript.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DownloadIso.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/DownloadIsoModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/OcmTNADisclaimer.d.ts.map +1 -0
- package/build/@types/common/components/clusterConfiguration/utils.d.ts +3 -1
- package/build/@types/common/components/clusterConfiguration/utils.d.ts.map +1 -1
- package/build/@types/common/components/clusterConfiguration/utils.test.d.ts +2 -0
- package/build/@types/common/components/clusterConfiguration/utils.test.d.ts.map +1 -0
- package/build/@types/common/components/clusterDetail/ConsoleModal.d.ts.map +1 -1
- package/build/@types/common/components/clusterDetail/FinalizingProgress.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/ClusterWizardStepHeader.d.ts.map +1 -1
- package/build/@types/common/components/hosts/AITableMemo.d.ts.map +1 -1
- package/build/@types/common/components/hosts/AdditionalNTPSourcesDialog.d.ts.map +1 -1
- package/build/@types/common/components/hosts/EditHostForm.d.ts.map +1 -1
- package/build/@types/common/components/hosts/EditHostModal.d.ts.map +1 -1
- package/build/@types/common/components/hosts/HostRequirements.d.ts.map +1 -1
- package/build/@types/common/components/hosts/MassChangeHostnameModal.d.ts.map +1 -1
- package/build/@types/common/components/hosts/MassDeleteHostModal.d.ts.map +1 -1
- package/build/@types/common/components/storage/DisksTable.d.ts.map +1 -1
- package/build/@types/common/components/storage/StorageUtils.d.ts.map +1 -1
- package/build/@types/common/components/ui/ConfirmationModal.d.ts +2 -3
- package/build/@types/common/components/ui/ConfirmationModal.d.ts.map +1 -1
- package/build/@types/common/components/ui/OpenShiftVersionModal.d.ts.map +1 -1
- package/build/@types/common/components/ui/SectionTitle.d.ts.map +1 -1
- package/build/@types/common/components/ui/StaticTextField.d.ts.map +1 -1
- package/build/@types/common/components/ui/eventsModal.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/AlertFormikError.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/RichInputField.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/TextAreaField.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/validationSchemas.d.ts +1 -1
- package/build/@types/common/components/ui/formik/validationSchemas.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/InventoryAddHost.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.d.ts.map +1 -1
- package/build/@types/ocm/components/AddHosts/day2Wizard/Day2Wizard.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/DiscoveryImageModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/HostInventory.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/DeleteCustomManifestModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.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/StackTypeControl.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts +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/ReviewPreflightChecks.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/CollapsedHost.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/BondsConfirmationModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/CancelInstallationModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterDetail.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterDetailStatusMessages.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterInstallationError.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterPollingErrorModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts +2 -0
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.test.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterDetail/ClusterUpdateErrorModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/OpenShiftVersionDetail.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ProgressBarAlerts.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ResetClusterModal.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/BasicStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/disconnected/ReviewStep.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/ClusterPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/Clusters.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/DeleteClusterModal.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/DeleteHostModal.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/HostRequirementsContent.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/ResetHostModal.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/UpdateDay2ApiVipForm.d.ts.map +1 -1
- package/build/@types/ocm/components/hosts/UpdateDay2ApiVipModal.d.ts.map +1 -1
- package/build/@types/ocm/components/ui/InfoLinkWithModal.d.ts +1 -2
- package/build/@types/ocm/components/ui/InfoLinkWithModal.d.ts.map +1 -1
- package/build/@types/ocm/services/ClustersService.d.ts +5 -5
- package/build/@types/ocm/services/HostsService.d.ts +11 -11
- package/build/@types/ocm/services/InfraEnvsService.d.ts +2 -2
- package/build/@types/ocm/services/UISettingsService.d.ts +1 -1
- package/build/@types/ocm/store/slices/infra-envs/thunks.d.ts +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscovery.js +2 -3
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscovery.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentNetworkingForm.js +4 -6
- package/build/cjs/cim/components/ClusterDeployment/ClusterDeploymentNetworkingForm.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js +9 -5
- package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js +1 -2
- package/build/cjs/cim/components/InfraEnv/EnvironmentDetails.js.map +1 -1
- package/build/cjs/cim/components/common/ResourceAlerts.js +15 -16
- package/build/cjs/cim/components/common/ResourceAlerts.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/ControlPlaneNodesDropdown.js +23 -6
- package/build/cjs/common/components/clusterConfiguration/ControlPlaneNodesDropdown.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryImageConfigForm.js +2 -3
- package/build/cjs/common/components/clusterConfiguration/DiscoveryImageConfigForm.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryInstructions.js +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryInstructions.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryIpxeInstructions.js +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryIpxeInstructions.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.js +7 -6
- package/build/cjs/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.js +1 -2
- package/build/cjs/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DownloadIpxeScript.js +2 -3
- package/build/cjs/common/components/clusterConfiguration/DownloadIpxeScript.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DownloadIso.js +5 -6
- package/build/cjs/common/components/clusterConfiguration/DownloadIso.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/DownloadIsoModal.js +3 -2
- package/build/cjs/common/components/clusterConfiguration/DownloadIsoModal.js.map +1 -1
- package/build/cjs/{ocm → common}/components/clusterConfiguration/OcmTNADisclaimer.js +1 -1
- package/build/cjs/common/components/clusterConfiguration/OcmTNADisclaimer.js.map +1 -0
- package/build/cjs/common/components/clusterConfiguration/utils.js +23 -12
- package/build/cjs/common/components/clusterConfiguration/utils.js.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/utils.test.js +242 -0
- package/build/cjs/common/components/clusterConfiguration/utils.test.js.map +1 -0
- package/build/cjs/common/components/clusterDetail/ConsoleModal.js +5 -3
- package/build/cjs/common/components/clusterDetail/ConsoleModal.js.map +1 -1
- package/build/cjs/common/components/clusterDetail/FinalizingProgress.js +1 -2
- package/build/cjs/common/components/clusterDetail/FinalizingProgress.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/ClusterWizardStepHeader.js +1 -2
- package/build/cjs/common/components/clusterWizard/ClusterWizardStepHeader.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js +1 -1
- package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/UserManagedNetworkingTextContent.js +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/UserManagedNetworkingTextContent.js.map +1 -1
- package/build/cjs/common/components/hosts/AITableMemo.js +2 -1
- package/build/cjs/common/components/hosts/AITableMemo.js.map +1 -1
- package/build/cjs/common/components/hosts/AdditionalNTPSourcesDialog.js +4 -4
- package/build/cjs/common/components/hosts/AdditionalNTPSourcesDialog.js.map +1 -1
- package/build/cjs/common/components/hosts/EditHostForm.js +2 -3
- package/build/cjs/common/components/hosts/EditHostForm.js.map +1 -1
- package/build/cjs/common/components/hosts/EditHostModal.js +3 -2
- package/build/cjs/common/components/hosts/EditHostModal.js.map +1 -1
- package/build/cjs/common/components/hosts/HostRequirements.js +1 -2
- package/build/cjs/common/components/hosts/HostRequirements.js.map +1 -1
- package/build/cjs/common/components/hosts/HostStatus.js +2 -2
- package/build/cjs/common/components/hosts/HostStatus.js.map +1 -1
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js +4 -4
- package/build/cjs/common/components/hosts/MassChangeHostnameModal.js.map +1 -1
- package/build/cjs/common/components/hosts/MassDeleteHostModal.js +4 -4
- package/build/cjs/common/components/hosts/MassDeleteHostModal.js.map +1 -1
- package/build/cjs/common/components/storage/DisksTable.js +1 -2
- package/build/cjs/common/components/storage/DisksTable.js.map +1 -1
- package/build/cjs/common/components/storage/StorageUtils.js +1 -2
- package/build/cjs/common/components/storage/StorageUtils.js.map +1 -1
- package/build/cjs/common/components/ui/ConfirmationModal.js +5 -4
- package/build/cjs/common/components/ui/ConfirmationModal.js.map +1 -1
- package/build/cjs/common/components/ui/OpenShiftVersionModal.js +7 -6
- package/build/cjs/common/components/ui/OpenShiftVersionModal.js.map +1 -1
- package/build/cjs/common/components/ui/SectionTitle.js +1 -2
- package/build/cjs/common/components/ui/SectionTitle.js.map +1 -1
- package/build/cjs/common/components/ui/StaticTextField.js +1 -2
- package/build/cjs/common/components/ui/StaticTextField.js.map +1 -1
- package/build/cjs/common/components/ui/eventsModal.js +9 -9
- package/build/cjs/common/components/ui/eventsModal.js.map +1 -1
- package/build/cjs/common/components/ui/formik/AlertFormikError.js +1 -2
- package/build/cjs/common/components/ui/formik/AlertFormikError.js.map +1 -1
- package/build/cjs/common/components/ui/formik/RichInputField.css +0 -7
- package/build/cjs/common/components/ui/formik/RichInputField.js +1 -1
- package/build/cjs/common/components/ui/formik/RichInputField.js.map +1 -1
- package/build/cjs/common/components/ui/formik/TextAreaField.js +2 -1
- package/build/cjs/common/components/ui/formik/TextAreaField.js.map +1 -1
- package/build/cjs/common/components/ui/formik/validationSchemas.js +13 -3
- package/build/cjs/common/components/ui/formik/validationSchemas.js.map +1 -1
- package/build/cjs/common/config/constants.js +5 -10
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/InventoryAddHost.js +3 -4
- package/build/cjs/ocm/components/AddHosts/InventoryAddHost.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.js +1 -2
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.js.map +1 -1
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2Wizard.js +1 -2
- package/build/cjs/ocm/components/AddHosts/day2Wizard/Day2Wizard.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/DiscoveryImageModal.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/DiscoveryImageModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/HostInventory.js +3 -5
- package/build/cjs/ocm/components/clusterConfiguration/HostInventory.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js +11 -9
- package/build/cjs/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/DeleteCustomManifestModal.js +7 -7
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/DeleteCustomManifestModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.js +0 -1
- package/build/cjs/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js +60 -18
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.js +49 -12
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.js +3 -3
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +2 -3
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js +67 -7
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js +31 -6
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js +7 -16
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +8 -8
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js +26 -8
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js +5 -5
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/CollapsedHost.js +1 -2
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/CollapsedHost.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/BondsConfirmationModal.js +4 -4
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/BondsConfirmationModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.js +1 -2
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.js +6 -7
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/CancelInstallationModal.js +6 -6
- package/build/cjs/ocm/components/clusterDetail/CancelInstallationModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterDetail.js +1 -2
- package/build/cjs/ocm/components/clusterDetail/ClusterDetail.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailStatusMessages.js +17 -14
- package/build/cjs/ocm/components/clusterDetail/ClusterDetailStatusMessages.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterInstallationError.js +4 -5
- package/build/cjs/ocm/components/clusterDetail/ClusterInstallationError.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterPollingErrorModal.js +5 -4
- package/build/cjs/ocm/components/clusterDetail/ClusterPollingErrorModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js +3 -4
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js +180 -0
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js.map +1 -0
- package/build/cjs/ocm/components/clusterDetail/ClusterUpdateErrorModal.js +5 -4
- package/build/cjs/ocm/components/clusterDetail/ClusterUpdateErrorModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/OpenShiftVersionDetail.js +1 -2
- package/build/cjs/ocm/components/clusterDetail/OpenShiftVersionDetail.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ProgressBarAlerts.js +4 -5
- package/build/cjs/ocm/components/clusterDetail/ProgressBarAlerts.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ResetClusterModal.js +5 -3
- package/build/cjs/ocm/components/clusterDetail/ResetClusterModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js +1 -2
- package/build/cjs/ocm/components/clusterWizard/disconnected/BasicStep.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js +1 -2
- package/build/cjs/ocm/components/clusterWizard/disconnected/ReviewStep.js.map +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterPage.js +1 -2
- package/build/cjs/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/cjs/ocm/components/clusters/Clusters.js +1 -2
- package/build/cjs/ocm/components/clusters/Clusters.js.map +1 -1
- package/build/cjs/ocm/components/clusters/DeleteClusterModal.js +8 -7
- package/build/cjs/ocm/components/clusters/DeleteClusterModal.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.js +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.js.map +1 -1
- package/build/cjs/ocm/components/hosts/DeleteHostModal.js +5 -4
- package/build/cjs/ocm/components/hosts/DeleteHostModal.js.map +1 -1
- package/build/cjs/ocm/components/hosts/HostRequirementsContent.js +1 -2
- package/build/cjs/ocm/components/hosts/HostRequirementsContent.js.map +1 -1
- package/build/cjs/ocm/components/hosts/ResetHostModal.js +8 -7
- package/build/cjs/ocm/components/hosts/ResetHostModal.js.map +1 -1
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipForm.js +2 -3
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipForm.js.map +1 -1
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipModal.js +3 -2
- package/build/cjs/ocm/components/hosts/UpdateDay2ApiVipModal.js.map +1 -1
- package/build/cjs/ocm/components/ui/InfoLinkWithModal.js +5 -4
- package/build/cjs/ocm/components/ui/InfoLinkWithModal.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscovery.tsx +3 -5
- package/lib/cim/components/ClusterDeployment/ClusterDeploymentNetworkingForm.tsx +8 -12
- package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx +17 -35
- package/lib/cim/components/InfraEnv/EnvironmentDetails.tsx +1 -5
- package/lib/cim/components/common/ResourceAlerts.tsx +26 -28
- package/lib/cim/types/k8s/agent-cluster-install.ts +1 -0
- package/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx +61 -31
- package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx +14 -6
- package/lib/common/components/clusterConfiguration/DiscoveryInstructions.tsx +2 -2
- package/lib/common/components/clusterConfiguration/DiscoveryIpxeInstructions.tsx +2 -2
- package/lib/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.tsx +15 -12
- package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.tsx +1 -3
- package/lib/common/components/clusterConfiguration/DownloadIpxeScript.tsx +6 -5
- package/lib/common/components/clusterConfiguration/DownloadIso.tsx +13 -7
- package/lib/common/components/clusterConfiguration/DownloadIsoModal.tsx +2 -3
- package/lib/{ocm → common}/components/clusterConfiguration/OcmTNADisclaimer.tsx +1 -1
- package/lib/common/components/clusterConfiguration/utils.test.ts +275 -0
- package/lib/common/components/clusterConfiguration/utils.ts +28 -9
- package/lib/common/components/clusterDetail/ConsoleModal.tsx +17 -10
- package/lib/common/components/clusterDetail/FinalizingProgress.tsx +4 -6
- package/lib/common/components/clusterWizard/ClusterWizardStepHeader.tsx +1 -3
- package/lib/common/components/clusterWizard/clusterDetailsValidation.ts +1 -1
- package/lib/common/components/clusterWizard/networkingSteps/UserManagedNetworkingTextContent.tsx +2 -2
- package/lib/common/components/hosts/AITableMemo.tsx +1 -0
- package/lib/common/components/hosts/AdditionalNTPSourcesDialog.tsx +11 -10
- package/lib/common/components/hosts/EditHostForm.tsx +6 -5
- package/lib/common/components/hosts/EditHostModal.tsx +2 -3
- package/lib/common/components/hosts/HostRequirements.tsx +2 -4
- package/lib/common/components/hosts/HostStatus.tsx +5 -5
- package/lib/common/components/hosts/MassChangeHostnameModal.tsx +9 -7
- package/lib/common/components/hosts/MassDeleteHostModal.tsx +15 -9
- package/lib/common/components/storage/DisksTable.tsx +1 -3
- package/lib/common/components/storage/StorageUtils.tsx +1 -3
- package/lib/common/components/ui/ConfirmationModal.tsx +18 -15
- package/lib/common/components/ui/OpenShiftVersionModal.tsx +32 -22
- package/lib/common/components/ui/SectionTitle.tsx +2 -4
- package/lib/common/components/ui/StaticTextField.tsx +2 -4
- package/lib/common/components/ui/eventsModal.tsx +29 -20
- package/lib/common/components/ui/formik/AlertFormikError.tsx +8 -10
- package/lib/common/components/ui/formik/RichInputField.css +0 -7
- package/lib/common/components/ui/formik/RichInputField.tsx +2 -1
- package/lib/common/components/ui/formik/TextAreaField.tsx +13 -4
- package/lib/common/components/ui/formik/_validationSchemas.test.ts +82 -0
- package/lib/common/components/ui/formik/validationSchemas.ts +16 -10
- package/lib/common/config/constants.ts +5 -11
- package/lib/ocm/components/AddHosts/InventoryAddHost.tsx +4 -6
- package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIpHostConfigurations.tsx +1 -5
- package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx +2 -4
- package/lib/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx +1 -1
- package/lib/ocm/components/clusterConfiguration/DiscoveryImageModal.tsx +6 -7
- package/lib/ocm/components/clusterConfiguration/HostInventory.tsx +7 -11
- package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx +43 -25
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/DeleteCustomManifestModal.tsx +22 -16
- package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/ExpandedManifest.tsx +1 -7
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +64 -18
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx +98 -36
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx +3 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +4 -5
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx +78 -11
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx +79 -11
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx +4 -9
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +17 -6
- package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx +34 -4
- package/lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx +7 -9
- package/lib/ocm/components/clusterConfiguration/staticIp/components/CollapsedHost.tsx +1 -3
- package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/BondsConfirmationModal.tsx +15 -9
- package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx +1 -3
- package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx +10 -3
- package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.tsx +6 -8
- package/lib/ocm/components/clusterDetail/CancelInstallationModal.tsx +19 -17
- package/lib/ocm/components/clusterDetail/ClusterDetail.tsx +1 -3
- package/lib/ocm/components/clusterDetail/ClusterDetailStatusMessages.tsx +34 -26
- package/lib/ocm/components/clusterDetail/ClusterInstallationError.tsx +5 -7
- package/lib/ocm/components/clusterDetail/ClusterPollingErrorModal.tsx +15 -13
- package/lib/ocm/components/clusterDetail/ClusterProperties.test.ts +215 -0
- package/lib/ocm/components/clusterDetail/ClusterProperties.tsx +3 -5
- package/lib/ocm/components/clusterDetail/ClusterUpdateErrorModal.tsx +17 -13
- package/lib/ocm/components/clusterDetail/OpenShiftVersionDetail.tsx +2 -4
- package/lib/ocm/components/clusterDetail/ProgressBarAlerts.tsx +5 -7
- package/lib/ocm/components/clusterDetail/ResetClusterModal.tsx +16 -12
- package/lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx +1 -3
- package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx +1 -3
- package/lib/ocm/components/clusters/AssistedInstallerHeader.tsx +2 -2
- package/lib/ocm/components/clusters/ClusterPage.tsx +1 -3
- package/lib/ocm/components/clusters/Clusters.tsx +1 -3
- package/lib/ocm/components/clusters/DeleteClusterModal.tsx +16 -11
- package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx +2 -2
- package/lib/ocm/components/hosts/DeleteHostModal.tsx +18 -9
- package/lib/ocm/components/hosts/HostRequirementsContent.tsx +3 -5
- package/lib/ocm/components/hosts/ResetHostModal.tsx +16 -13
- package/lib/ocm/components/hosts/UpdateDay2ApiVipForm.tsx +12 -6
- package/lib/ocm/components/hosts/UpdateDay2ApiVipModal.tsx +2 -3
- package/lib/ocm/components/ui/InfoLinkWithModal.tsx +16 -13
- package/package.json +3 -3
- package/build/@types/ocm/components/clusterConfiguration/OcmTNADisclaimer.d.ts.map +0 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.d.ts +0 -6
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.d.ts.map +0 -1
- package/build/cjs/ocm/components/clusterConfiguration/OcmTNADisclaimer.js.map +0 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.js +0 -25
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.js.map +0 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/UserManagedNetworkingTextContent.tsx +0 -30
- /package/build/@types/{ocm → common}/components/clusterConfiguration/OcmTNADisclaimer.d.ts +0 -0
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js
CHANGED
|
@@ -4,19 +4,65 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
5
|
const react_core_1 = require("@patternfly/react-core");
|
|
6
6
|
const formik_1 = require("formik");
|
|
7
|
+
const ip_address_1 = require("ip-address");
|
|
7
8
|
const common_1 = require("../../../../common");
|
|
8
9
|
const OcmFormFields_1 = require("../../ui/OcmFormFields");
|
|
9
|
-
const getNetworkLabelSuffix = (index, isDualStack) => {
|
|
10
|
-
return isDualStack ? ` (${index === 0 ? 'IPv4' : 'IPv6'})` : '';
|
|
11
|
-
};
|
|
12
10
|
const IPv4PrefixPopoverText = 'For example, if Cluster Network Host Prefix is set to 23, then each node is assigned a /23 subnet out of the given cidr (clusterNetworkCIDR), which allows for 510 (2^(32 - 23) - 2) pod IPs addresses.';
|
|
13
11
|
const IPv6PrefixPopoverText = 'For example, if Cluster Network Host Prefix is set to 116, then each node is assigned a /116 subnet out of the given cidr (clusterNetworkCIDR), which allows for 4,094 (2^(128 - 116) - 2) pod IPs addresses.';
|
|
14
12
|
const ClusterPrefixHelperText = 'Defines how big the subnets for each individual node are out of the given CIDR. Must enter a whole number.';
|
|
15
13
|
const clusterCidrHelperText = 'The block must not overlap with existing physical networks. To access the Pods from an external network, configure load balancers and routers to manage the traffic.';
|
|
16
14
|
const serviceCidrHelperText = 'Enter only 1 IP address pool. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.';
|
|
17
15
|
const AdvancedNetworkFields = () => {
|
|
18
|
-
const { values, errors } = (0, formik_1.useFormikContext)();
|
|
16
|
+
const { values, errors, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
19
17
|
const isDualStack = values.stackType === common_1.DUAL_STACK;
|
|
18
|
+
// Reorder Cluster Networks and Service Networks when Machine Network primary changes
|
|
19
|
+
react_1.default.useEffect(() => {
|
|
20
|
+
var _a, _b;
|
|
21
|
+
if (!isDualStack || !((_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr))
|
|
22
|
+
return;
|
|
23
|
+
const primaryMachineNetworkCidr = values.machineNetworks[0].cidr;
|
|
24
|
+
const isPrimaryIPv6 = ip_address_1.Address6.isValid(primaryMachineNetworkCidr);
|
|
25
|
+
// Check Cluster Networks
|
|
26
|
+
if (values.clusterNetworks && values.clusterNetworks.length >= 2) {
|
|
27
|
+
const firstClusterCidr = values.clusterNetworks[0].cidr;
|
|
28
|
+
if (!firstClusterCidr)
|
|
29
|
+
return;
|
|
30
|
+
const isFirstClusterIPv6 = ip_address_1.Address6.isValid(firstClusterCidr);
|
|
31
|
+
// If primary machine is IPv6 but first cluster is IPv4, swap them
|
|
32
|
+
if (isPrimaryIPv6 && !isFirstClusterIPv6) {
|
|
33
|
+
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
34
|
+
setFieldValue('clusterNetworks', reordered, false);
|
|
35
|
+
}
|
|
36
|
+
// If primary machine is IPv4 but first cluster is IPv6, swap them
|
|
37
|
+
else if (!isPrimaryIPv6 && isFirstClusterIPv6) {
|
|
38
|
+
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
39
|
+
setFieldValue('clusterNetworks', reordered, false);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
// Check Service Networks
|
|
43
|
+
if (values.serviceNetworks && values.serviceNetworks.length >= 2) {
|
|
44
|
+
const firstServiceCidr = values.serviceNetworks[0].cidr;
|
|
45
|
+
if (!firstServiceCidr)
|
|
46
|
+
return;
|
|
47
|
+
const isFirstServiceIPv6 = ip_address_1.Address6.isValid(firstServiceCidr);
|
|
48
|
+
// If primary machine is IPv6 but first service is IPv4, swap them
|
|
49
|
+
if (isPrimaryIPv6 && !isFirstServiceIPv6) {
|
|
50
|
+
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
51
|
+
setFieldValue('serviceNetworks', reordered, false);
|
|
52
|
+
}
|
|
53
|
+
// If primary machine is IPv4 but first service is IPv6, swap them
|
|
54
|
+
else if (!isPrimaryIPv6 && isFirstServiceIPv6) {
|
|
55
|
+
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
56
|
+
setFieldValue('serviceNetworks', reordered, false);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}, [
|
|
60
|
+
isDualStack,
|
|
61
|
+
values.machineNetworks,
|
|
62
|
+
values.clusterNetworks,
|
|
63
|
+
values.serviceNetworks,
|
|
64
|
+
setFieldValue,
|
|
65
|
+
]);
|
|
20
66
|
const clusterNetworkCidrPrefix = (index) => parseInt(((values.clusterNetworks && values.clusterNetworks[index].cidr) || '').split('/')[1]) || 1;
|
|
21
67
|
const isSubnetIPv6 = (index) => (isDualStack ? !!index : false);
|
|
22
68
|
const clusterNetworkHostPrefixPopoverText = (index) => (react_1.default.createElement(react_1.default.Fragment, null,
|
|
@@ -25,22 +71,18 @@ const AdvancedNetworkFields = () => {
|
|
|
25
71
|
' ',
|
|
26
72
|
isSubnetIPv6(index) ? IPv6PrefixPopoverText : IPv4PrefixPopoverText),
|
|
27
73
|
react_1.default.createElement("p", null, "If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.")));
|
|
28
|
-
return (react_1.default.createElement(react_core_1.Grid, {
|
|
74
|
+
return (react_1.default.createElement(react_core_1.Grid, { className: "pf-v6-u-ml-lg" },
|
|
29
75
|
react_1.default.createElement(formik_1.FieldArray, { name: "clusterNetworks" }, () => {
|
|
30
76
|
var _a;
|
|
31
77
|
return (react_1.default.createElement(react_core_1.FormGroup, { fieldId: "clusterNetworks", labelInfo: isDualStack && 'Primary' }, (_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.map((_, index) => {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
react_1.default.createElement(react_core_1.GridItem, { className: 'network-field-group pf-v6-u-pb-md' },
|
|
78
|
+
return (react_1.default.createElement(react_core_1.Grid, { key: index, className: "pf-v6-u-pb-md" },
|
|
79
|
+
react_1.default.createElement(react_core_1.GridItem, { className: 'network-field-group' },
|
|
35
80
|
react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: `clusterNetworks.${index}.cidr`, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
36
|
-
react_1.default.createElement("span", null,
|
|
37
|
-
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: 'IP address blocks from which Pod IPs are allocated.' })), helperText: clusterCidrHelperText, isRequired: true, labelInfo: index === 0
|
|
38
|
-
react_1.default.createElement(react_core_1.GridItem, { className: 'network-field-group
|
|
81
|
+
react_1.default.createElement("span", null, "Cluster network CIDR "),
|
|
82
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: 'IP address blocks from which Pod IPs are allocated.' })), helperText: clusterCidrHelperText, isRequired: true, labelInfo: isDualStack ? (index === 0 ? 'Primary' : 'Secondary') : '' })),
|
|
83
|
+
react_1.default.createElement(react_core_1.GridItem, { className: 'network-field-group' },
|
|
39
84
|
react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: `clusterNetworks.${index}.hostPrefix`, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
40
|
-
react_1.default.createElement("span", null,
|
|
41
|
-
"Cluster network host prefix",
|
|
42
|
-
networkSuffix,
|
|
43
|
-
" "),
|
|
85
|
+
react_1.default.createElement("span", null, "Cluster network host prefix "),
|
|
44
86
|
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: clusterNetworkHostPrefixPopoverText(index), minWidth: "30rem" })), type: react_core_1.TextInputTypes.number, min: clusterNetworkCidrPrefix(index), max: isSubnetIPv6(index)
|
|
45
87
|
? common_1.PREFIX_MAX_RESTRICTION.IPv6
|
|
46
88
|
: common_1.PREFIX_MAX_RESTRICTION.IPv4, helperText: ClusterPrefixHelperText, isRequired: true }))));
|
|
@@ -49,10 +91,10 @@ const AdvancedNetworkFields = () => {
|
|
|
49
91
|
typeof errors.clusterNetworks === 'string' && (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.warning, title: errors.clusterNetworks, isInline: true })),
|
|
50
92
|
react_1.default.createElement(formik_1.FieldArray, { name: "serviceNetworks" }, () => {
|
|
51
93
|
var _a;
|
|
52
|
-
return (react_1.default.createElement(react_core_1.FormGroup, { fieldId: "serviceNetworks", labelInfo: isDualStack && 'Primary' }, (_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.map((_, index) => (react_1.default.createElement(react_core_1.GridItem, { key: index, className: 'network-field-group
|
|
94
|
+
return (react_1.default.createElement(react_core_1.FormGroup, { fieldId: "serviceNetworks", labelInfo: isDualStack && 'Primary' }, (_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.map((_, index) => (react_1.default.createElement(react_core_1.GridItem, { key: index, className: 'network-field-group' },
|
|
53
95
|
react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: `serviceNetworks.${index}.cidr`, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
54
|
-
react_1.default.createElement("span", null,
|
|
55
|
-
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: 'The IP address pool used for service IP addresses.' })), helperText: serviceCidrHelperText, isRequired: true, labelInfo: index === 0
|
|
96
|
+
react_1.default.createElement("span", null, "Service network CIDR "),
|
|
97
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: 'The IP address pool used for service IP addresses.' })), helperText: serviceCidrHelperText, isRequired: true, labelInfo: isDualStack ? (index === 0 ? 'Primary' : 'Secondary') : '' }))))));
|
|
56
98
|
}),
|
|
57
99
|
typeof errors.serviceNetworks === 'string' && (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.warning, title: errors.serviceNetworks, isInline: true }))));
|
|
58
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdvancedNetworkFields.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAOgC;AAChC,mCAAsD;AACtD,+CAK4B;AAC5B,0DAAuD;AAEvD,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"AdvancedNetworkFields.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,32 +18,69 @@ const useAutoSelectSingleAvailableSubnet = (autoSelectNetwork, setFieldValue, ci
|
|
|
18
18
|
}
|
|
19
19
|
}, [autoSelectNetwork, cidr, clusterId, setFieldValue]);
|
|
20
20
|
};
|
|
21
|
-
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, }) => {
|
|
21
|
+
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, }) => {
|
|
22
22
|
var _a;
|
|
23
23
|
const { values, errors, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
24
24
|
const isDualStack = values.stackType === common_1.DUAL_STACK;
|
|
25
25
|
const { isViewerMode } = (0, react_redux_1.useSelector)(selectors_1.selectCurrentClusterPermissionsState);
|
|
26
|
+
// Check if OCP version supports IPv6 as primary network
|
|
27
|
+
const supportsIPv6Primary = openshiftVersion && (0, common_1.isMajorMinorVersionEqualOrGreater)(openshiftVersion, '4.12');
|
|
26
28
|
const IPv4Subnets = hostSubnets
|
|
27
29
|
.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet))
|
|
28
30
|
.sort(subnetSort);
|
|
29
31
|
const IPv6Subnets = hostSubnets
|
|
30
32
|
.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet))
|
|
31
33
|
.sort(subnetSort);
|
|
34
|
+
// For OCP >= 4.12, both networks can use either IPv4 or IPv6
|
|
35
|
+
const allSubnets = supportsIPv6Primary
|
|
36
|
+
? [...IPv4Subnets, ...IPv6Subnets].sort(subnetSort)
|
|
37
|
+
: IPv4Subnets;
|
|
38
|
+
// For auto-selection, always use IPv4 subnets for single-stack
|
|
32
39
|
const cidr = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : common_1.NO_SUBNET_SET;
|
|
33
40
|
const hasEmptySelection = ((_a = values.machineNetworks) !== null && _a !== void 0 ? _a : []).length === 0;
|
|
34
41
|
const autoSelectNetwork = !isViewerMode && hasEmptySelection;
|
|
35
42
|
useAutoSelectSingleAvailableSubnet(autoSelectNetwork, setFieldValue, cidr, clusterId);
|
|
36
|
-
return (react_1.default.createElement(
|
|
37
|
-
react_1.default.createElement(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
43
|
+
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
44
|
+
react_1.default.createElement(react_core_1.FormGroup, { label: "Machine network", labelInfo: isDualStack && 'Primary', fieldId: "machine-networks", isRequired: isRequired },
|
|
45
|
+
react_1.default.createElement(formik_1.FieldArray, { name: "machineNetworks" }, () => {
|
|
46
|
+
var _a;
|
|
47
|
+
return (react_1.default.createElement(react_core_1.Stack, null, isDualStack ? ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.map((machineNetwork, index) => {
|
|
48
|
+
if (index > 0)
|
|
49
|
+
return null;
|
|
50
|
+
const machineSubnets = supportsIPv6Primary ? allSubnets : IPv4Subnets;
|
|
51
|
+
return (react_1.default.createElement(react_core_1.StackItem, { key: index },
|
|
52
|
+
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.${index}.cidr`, machineSubnets: machineSubnets, isDisabled: isDisabled, "data-testid": `subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}` })));
|
|
53
|
+
})) : (react_1.default.createElement(react_core_1.StackItem, null,
|
|
54
|
+
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.0.cidr`, machineSubnets: IPv4Subnets, isDisabled: isDisabled, "data-testid": 'subnets-dropdown-toggle-primary' })))));
|
|
55
|
+
}),
|
|
56
|
+
typeof errors.machineNetworks === 'string' && (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.warning, title: errors.machineNetworks, isInline: true }))),
|
|
57
|
+
isDualStack && values.machineNetworks && values.machineNetworks.length > 1 && (react_1.default.createElement(react_core_1.FormGroup, { label: "Machine network", labelInfo: "Secondary", fieldId: "machine-networks-secondary", isRequired: isRequired },
|
|
58
|
+
react_1.default.createElement(formik_1.FieldArray, { name: "machineNetworks" }, () => {
|
|
59
|
+
var _a, _b;
|
|
60
|
+
const index = 1;
|
|
61
|
+
let machineSubnets;
|
|
62
|
+
if (supportsIPv6Primary) {
|
|
63
|
+
// For OCP >= 4.12, smart filtering based on the other network's selection
|
|
64
|
+
const firstNetworkCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
65
|
+
if (firstNetworkCidr && ip_address_1.Address6.isValid(firstNetworkCidr)) {
|
|
66
|
+
// If first is IPv6, second should be IPv4
|
|
67
|
+
machineSubnets = IPv4Subnets;
|
|
68
|
+
}
|
|
69
|
+
else if (firstNetworkCidr && ip_address_1.Address4.isValid(firstNetworkCidr)) {
|
|
70
|
+
// If first is IPv4, second should be IPv6
|
|
71
|
+
machineSubnets = IPv6Subnets;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
// If first is not selected yet, show all subnets
|
|
75
|
+
machineSubnets = allSubnets;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
// For older versions, second network is IPv6
|
|
80
|
+
machineSubnets = IPv6Subnets;
|
|
81
|
+
}
|
|
82
|
+
return (react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.${index}.cidr`, machineSubnets: machineSubnets, isDisabled: isDisabled, "data-testid": `subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}` }));
|
|
83
|
+
})))));
|
|
47
84
|
};
|
|
48
85
|
exports.AvailableSubnetsControl = AvailableSubnetsControl;
|
|
49
86
|
//# sourceMappingURL=AvailableSubnetsControl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":";;;;AAAA,uDAAyC;AACzC,6CAA0C;AAC1C,uDAA0F;AAC1F,mCAAqE;AACrE,2CAAgD;AAEhD,+
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.js
CHANGED
|
@@ -106,10 +106,10 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
|
|
|
106
106
|
defaultNetworkSettings.serviceNetworksIpv4,
|
|
107
107
|
]);
|
|
108
108
|
react_1.default.useEffect(() => {
|
|
109
|
-
if (!isViewerMode && isDualStack
|
|
109
|
+
if (!isViewerMode && isDualStack) {
|
|
110
110
|
toggleAdvConfiguration(true);
|
|
111
111
|
}
|
|
112
|
-
}, [isDualStack,
|
|
112
|
+
}, [isDualStack, isViewerMode, toggleAdvConfiguration]);
|
|
113
113
|
const managedNetworkingState = react_1.default.useMemo(() => {
|
|
114
114
|
var _a;
|
|
115
115
|
return getManagedNetworkingState(isDualStack, (0, utils_1.isOciPlatformType)(cluster), featureSupportLevelContext, (_a = cluster.platform) === null || _a === void 0 ? void 0 : _a.type, featureSupportLevelData);
|
|
@@ -131,7 +131,7 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
|
|
|
131
131
|
(0, common_1.selectApiVip)(cluster) === '' &&
|
|
132
132
|
(0, common_1.selectIngressVip)(cluster) === '') ||
|
|
133
133
|
hostSubnets.length === 0 ||
|
|
134
|
-
false }))),
|
|
134
|
+
false, openshiftVersion: cluster.openshiftVersion }))),
|
|
135
135
|
!isUserManagedNetworking && (react_1.default.createElement(react_core_1.StackItem, null,
|
|
136
136
|
react_1.default.createElement(VirtualIPControlGroup_1.VirtualIPControlGroup, { cluster: cluster, isVipDhcpAllocationDisabled: isVipDhcpAllocationDisabled || !isSDNSupported, supportLevel: featureSupportLevelContext.getFeatureSupportLevel('VIP_AUTO_ALLOC') }))),
|
|
137
137
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,6CAA0C;AAC1C,uDAAmE;AACnE,mEAA4F;AAC5F,+CAY4B;AAC5B,iGAGqE;AACrE,yDAA2D;AAC3D,uEAAoE;AACpE,4FAA4D;AAC5D,+EAAuG;AACvG,0DAAqD;AACrD,iIAA8H;AAC9H,mGAI+D;AAM/D,qGAAqE;AACrE,uCAAgD;AAahD,MAAM,gBAAgB,GAAG,CACvB,OAAgB,EAChB,oBAA+F,EAC/F,EAAE,CACF,CAAC,CACC,IAAA,6BAAoB,EAClB,OAAO,CAAC,eAAe,IAAI,EAAE,EAC7B,oBAAoB,CAAC,mBAAmB,IAAI,EAAE,CAC/C;IACD,IAAA,6BAAoB,EAClB,OAAO,CAAC,eAAe,IAAI,EAAE,EAC7B,oBAAoB,CAAC,mBAAmB,IAAI,EAAE,CAC/C,CACF,CAAC;AAEJ,MAAM,kCAAkC,GAAG,CACzC,WAAoB,EACpB,2BAAoC,EACpC,uBAAmD,EACnD,EAAE;IACF,IAAI,2BAA2B,EAAE;QAC/B,OAAO,gFAAgF,CAAC;KACzF;SAAM,IAAI,WAAW,EAAE;QACtB,OAAO,+DAA+D,CAAC;KACxE;SAAM,IAAI,uBAAuB,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,EAAE;QAC9E,OAAO,uBAAuB,CAAC,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;KACnF;AACH,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CACnC,0BAAsD,EACtD,YAA2B,EAC3B,sBAAyD,EACzD,EAAE;IACF,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,EAAE;QAC7E,OAAO,0BAA0B,CAAC,wBAAwB,CACxD,yBAAyB,EACzB,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,SAAS,EACnC,SAAS,EACT,YAAY,CACb,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CACtC,0BAAsD,EACtD,sBAAyD,EACzD,EAAE;IACF,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,EAAE;QAChF,OAAO,0BAA0B,CAAC,wBAAwB,CACxD,4BAA4B,EAC5B,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,SAAS,CACpC,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,WAAoB,EACpB,2BAAoC,EACpC,uBAAmD,EACnD,YAA2B,EAC3B,sBAAyD,EAKzD,EAAE;IACF,MAAM,gBAAgB,GAAG,kCAAkC,CACzD,WAAW,EACX,2BAA2B,EAC3B,uBAAuB,CACxB,CAAC;IACF,MAAM,SAAS,GAAG,+BAA+B,CAC/C,uBAAuB,EACvB,sBAAsB,CACvB,CAAC;IACF,MAAM,SAAS,GAAG,4BAA4B,CAC5C,uBAAuB,EACvB,YAAY,EACZ,sBAAsB,CACvB,CAAC;IAEF,OAAO;QACL,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,IAAI,gBAAgB,CAAC;QAC1D,4BAA4B,EAAE,SAAS,IAAI,gBAAgB;QAC3D,yBAAyB,EAAE,SAAS,IAAI,gBAAgB;KACzD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,EAC5B,OAAO,EACP,WAAW,EACX,2BAA2B,EAC3B,sBAAsB,GACI,EAAE,EAAE;;IAC9B,MAAM,0BAA0B,GAAG,IAAA,mDAAyB,GAAE,CAAC;IAC/D,MAAM,uBAAuB,GAAG,IAAA,6BAAmB,EACjD,UAAU,EACV,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,eAAkC,EAC1C,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAAI,CACvB,CAAC;IACF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAW,EAAC,gDAAoC,CAAC,CAAC;IAC3E,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAEhG,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IACpC,MAAM,uBAAuB,GAAG,MAAM,CAAC,qBAAqB,KAAK,aAAa,CAAC;IAC/E,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,KAAK,mBAAU,CAAC;IAEpD,MAAM,qBAAqB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAA,uBAAc,EAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9F,MAAM,eAAe,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACzC,OAAO,IAAA,gCAAuB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAC9C,WAAW,IAAI,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,CAAC,CACjE,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;;QACnB,IAAI,uBAAuB,EAAE;YAC3B,2FAA2F;YAC3F,IAAI,MAAM,CAAC,iBAAiB,KAAI,MAAA,MAAM,CAAC,WAAW,0CAAE,MAAM,CAAA,KAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;gBACpF,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;gBAC1C,aAAa,CAAC,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;gBACxC,aAAa,CAAC,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;aACrC;YAED,IAAI,CAAC,YAAY,KAAI,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,CAAA,EAAE;gBACnD,aAAa,CAAC,iBAAiB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;aAC7C;SACF;IACH,CAAC,EAAE;QACD,YAAY;QACZ,uBAAuB;QACvB,MAAM,CAAC,iBAAiB;QACxB,aAAa;QACb,aAAa;QACb,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,WAAW;QAClB,MAAM,CAAC,eAAe;KACvB,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAG,eAAK,CAAC,WAAW,CAC9C,CAAC,OAAgB,EAAE,EAAE;QACnB,WAAW,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI,CAAC,OAAO,EAAE;YACZ,aAAa,CACX,iBAAiB,EACjB,WAAW;gBACT,CAAC,CAAC,sBAAsB,CAAC,wBAAwB;gBACjD,CAAC,CAAC,sBAAsB,CAAC,mBAAmB,EAC9C,IAAI,CACL,CAAC;YACF,aAAa,CACX,iBAAiB,EACjB,WAAW;gBACT,CAAC,CAAC,sBAAsB,CAAC,wBAAwB;gBACjD,CAAC,CAAC,sBAAsB,CAAC,mBAAmB,EAC9C,IAAI,CACL,CAAC;SACH;IACH,CAAC,EACD;QACE,aAAa;QACb,WAAW;QACX,sBAAsB,CAAC,wBAAwB;QAC/C,sBAAsB,CAAC,mBAAmB;QAC1C,sBAAsB,CAAC,wBAAwB;QAC/C,sBAAsB,CAAC,mBAAmB;KAC3C,CACF,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,YAAY,IAAI,WAAW,EAAE;YAChC,sBAAsB,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAExD,MAAM,sBAAsB,GAAG,eAAK,CAAC,OAAO,CAC1C,GAAG,EAAE;;QACH,OAAA,yBAAyB,CACvB,WAAW,EACX,IAAA,yBAAiB,EAAC,OAAO,CAAC,EAC1B,0BAA0B,EAC1B,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAAI,EACtB,uBAAuB,CACxB,CAAA;KAAA,EACH,CAAC,WAAW,EAAE,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,CAAC,CAC5E,CAAC;IAEF,MAAM,cAAc,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACxC,OAAO,0BAA0B,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAC3E,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAEjC,OAAO,CACL,8BAAC,kBAAK,IAAC,SAAS;QACd,8BAAC,sBAAS;YACR,8BAAC,+CAA6B,IAC5B,QAAQ,EAAE,YAAY,IAAI,sBAAsB,CAAC,UAAU,EAC3D,kBAAkB,EAAE,sBAAsB,CAAC,4BAA4B,EACvE,kBAAkB,EAAE,sBAAsB,CAAC,yBAAyB,GACpE,CACQ;QAEX,uBAAuB,IAAI,CAC1B,8BAAC,sBAAS;YACR,8BAAC,kDAAgC,IAC/B,gCAAgC,EAAE,CAAC,YAAY,EAC/C,UAAU,EAAE,OAAO,CAAC,gBAAgB,GACpC,CACQ,CACb;QAEA,CAAC,YAAY,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAC7C,8BAAC,sBAAS;YACR,8BAAC,wCAAqB,IACpB,SAAS,EAAE,OAAO,CAAC,EAAE,EACrB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW,GACxB,CACQ,CACb;QACA,cAAc,IAAI,CACjB,8BAAC,sBAAS;YACR,8BAAC,iDAAuB,IAAC,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,GAAI,CAC7E,CACb;QAEA,CAAC,CAAC,uBAAuB,IAAI,CAAC,YAAY,CAAC,IAAI,CAC9C,8BAAC,sBAAS;YACR,8BAAC,iDAAuB,IACtB,SAAS,EAAE,OAAO,CAAC,EAAE,EACrB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,CAAC,uBAAuB,EACpC,UAAU,EACR,CAAC,OAAO,CAAC,iBAAiB;oBACxB,IAAA,qBAAY,EAAC,OAAO,CAAC,KAAK,EAAE;oBAC5B,IAAA,yBAAgB,EAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnC,WAAW,CAAC,MAAM,KAAK,CAAC;oBACxB,KAAK,EAEP,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,GAC1C,CACQ,CACb;QAEA,CAAC,uBAAuB,IAAI,CAC3B,8BAAC,sBAAS;YACR,8BAAC,6CAAqB,IACpB,OAAO,EAAE,OAAO,EAChB,2BAA2B,EAAE,2BAA2B,IAAI,CAAC,cAAc,EAC3E,YAAY,EAAE,0BAA0B,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,GACjF,CACQ,CACb;QACD,8BAAC,sBAAS;YACR,8BAAC,oBAAO,IACN,OAAO,EAAE,iEAAiE,EAC1E,MAAM,EAAE,CAAC,WAAW,EACpB,QAAQ,EAAE,WAAW;gBAErB,8BAAC,2BAAW,IACV,EAAE,EAAC,uBAAuB,EAC1B,KAAK,EAAC,yBAAyB,EAC/B,WAAW,EAAC,8DAA8D,EAC1E,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAC1D,UAAU,EAAE,WAAW,GACvB,CACM,CACA;QACX,UAAU,IAAI,CACb,8BAAC,sBAAS;YACR,8BAAC,+BAAqB,OAAG,CACf,CACb,CACK,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
|
|
@@ -77,8 +77,7 @@ const NetworkConfigurationForm = ({ cluster, hostSubnets, defaultNetworkSettings
|
|
|
77
77
|
react_1.default.createElement(NetworkConfiguration_1.default, { cluster: cluster, hostSubnets: hostSubnets, defaultNetworkSettings: defaultNetworkSettings, isVipDhcpAllocationDisabled: isHostsPlatformTypeNutanix }),
|
|
78
78
|
react_1.default.createElement(common_1.SecurityFields, { clusterSshKey: cluster.sshPublicKey, imageSshKey: infraEnv === null || infraEnv === void 0 ? void 0 : infraEnv.sshAuthorizedKey, isDisabled: isViewerMode }))),
|
|
79
79
|
react_1.default.createElement(react_core_1.GridItem, null,
|
|
80
|
-
react_1.default.createElement(react_core_1.Content,
|
|
81
|
-
react_1.default.createElement(react_core_1.Content, { component: "h2" }, "Host inventory")),
|
|
80
|
+
react_1.default.createElement(react_core_1.Content, { component: "h2" }, "Host inventory"),
|
|
82
81
|
react_1.default.createElement(NetworkConfigurationTable_1.default, { cluster: cluster }))))));
|
|
83
82
|
};
|
|
84
83
|
const NetworkConfigurationPage = ({ cluster }) => {
|
|
@@ -101,7 +100,7 @@ const NetworkConfigurationPage = ({ cluster }) => {
|
|
|
101
100
|
const initialValues = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkInitialValues)(cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported),
|
|
102
101
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
103
102
|
[]);
|
|
104
|
-
const memoizedValidationSchema = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkConfigurationValidationSchema)(initialValues, hostSubnets), [hostSubnets, initialValues]);
|
|
103
|
+
const memoizedValidationSchema = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkConfigurationValidationSchema)(initialValues, hostSubnets, cluster.openshiftVersion), [hostSubnets, initialValues, cluster.openshiftVersion]);
|
|
105
104
|
react_1.default.useEffect(() => {
|
|
106
105
|
if (infraEnvError) {
|
|
107
106
|
const title = `Failed to retrieve infra env (clusterId: ${cluster.id})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js
CHANGED
|
@@ -33,21 +33,66 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
33
33
|
const { isViewerMode } = (0, react_redux_1.useSelector)(selectors_1.selectCurrentClusterPermissionsState);
|
|
34
34
|
const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === common_1.DUAL_STACK;
|
|
35
35
|
const setSingleStack = react_1.default.useCallback(() => {
|
|
36
|
-
var _a
|
|
36
|
+
var _a;
|
|
37
37
|
setFieldValue('stackType', common_1.IPV4_STACK);
|
|
38
38
|
if (values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
|
|
39
|
-
|
|
39
|
+
// For single-stack IPv4, prefer IPv4 machine network
|
|
40
|
+
const firstNetwork = values.machineNetworks[0];
|
|
41
|
+
const isFirstIPv4 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr);
|
|
42
|
+
if (isFirstIPv4) {
|
|
43
|
+
// Keep the first network if it's IPv4
|
|
44
|
+
setFieldValue('machineNetworks', [firstNetwork]);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
// If first is IPv6, look for IPv4 network or set empty for auto-selection
|
|
48
|
+
const ipv4Network = values.machineNetworks.find((network) => network.cidr && ip_address_1.Address4.isValid(network.cidr));
|
|
49
|
+
if (ipv4Network) {
|
|
50
|
+
setFieldValue('machineNetworks', [ipv4Network]);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
// No IPv4 network found, set empty for auto-selection
|
|
54
|
+
setFieldValue('machineNetworks', []);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
40
57
|
}
|
|
41
|
-
|
|
42
|
-
|
|
58
|
+
// Ensure single-stack inputs are IPv4 after switching from dual-stack
|
|
59
|
+
if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
|
|
60
|
+
const defaultCluster = defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
|
|
61
|
+
const firstCluster = values.clusterNetworks[0];
|
|
62
|
+
const ipv4Cluster = defaultCluster
|
|
63
|
+
? {
|
|
64
|
+
cidr: defaultCluster.cidr,
|
|
65
|
+
hostPrefix: defaultCluster.hostPrefix,
|
|
66
|
+
clusterId: firstCluster.clusterId, // ← Preserve clusterId from original network
|
|
67
|
+
}
|
|
68
|
+
: {
|
|
69
|
+
cidr: '',
|
|
70
|
+
hostPrefix: '',
|
|
71
|
+
clusterId: clusterId, // ← Use current clusterId
|
|
72
|
+
};
|
|
73
|
+
setFieldValue('clusterNetworks', [ipv4Cluster]);
|
|
43
74
|
}
|
|
44
|
-
if (values.serviceNetworks &&
|
|
45
|
-
|
|
75
|
+
if (values.serviceNetworks && values.serviceNetworks.length >= 1) {
|
|
76
|
+
const defaultService = defaultNetworkValues.serviceNetworksIpv4 && defaultNetworkValues.serviceNetworksIpv4[0];
|
|
77
|
+
const firstService = values.serviceNetworks[0];
|
|
78
|
+
const ipv4Service = defaultService
|
|
79
|
+
? {
|
|
80
|
+
cidr: defaultService.cidr,
|
|
81
|
+
clusterId: firstService.clusterId, // ← Preserve clusterId from original network
|
|
82
|
+
}
|
|
83
|
+
: {
|
|
84
|
+
cidr: '',
|
|
85
|
+
clusterId: clusterId, // ← Use current clusterId
|
|
86
|
+
};
|
|
87
|
+
setFieldValue('serviceNetworks', [ipv4Service]);
|
|
46
88
|
}
|
|
47
89
|
void validateForm();
|
|
48
90
|
}, [
|
|
49
91
|
setFieldValue,
|
|
50
92
|
validateForm,
|
|
93
|
+
clusterId,
|
|
94
|
+
defaultNetworkValues.clusterNetworksIpv4,
|
|
95
|
+
defaultNetworkValues.serviceNetworksIpv4,
|
|
51
96
|
values.clusterNetworks,
|
|
52
97
|
values.machineNetworks,
|
|
53
98
|
values.serviceNetworks,
|
|
@@ -60,7 +105,22 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
60
105
|
setFieldValue('networkType', common_1.NETWORK_TYPE_OVN);
|
|
61
106
|
}
|
|
62
107
|
if (values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) < 2) {
|
|
63
|
-
|
|
108
|
+
// Ensure IPv4 is primary when switching to dual-stack
|
|
109
|
+
const firstNetwork = values.machineNetworks[0];
|
|
110
|
+
const isFirstIPv6 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address6.isValid(firstNetwork.cidr);
|
|
111
|
+
if (isFirstIPv6) {
|
|
112
|
+
// If first network is IPv6, make IPv4 primary and IPv6 secondary
|
|
113
|
+
const IPv4Subnets = hostSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
|
|
114
|
+
const cidrIPv4 = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : common_1.NO_SUBNET_SET;
|
|
115
|
+
setFieldValue('machineNetworks', [
|
|
116
|
+
{ cidr: cidrIPv4, clusterId: clusterId },
|
|
117
|
+
{ cidr: firstNetwork.cidr, clusterId: clusterId },
|
|
118
|
+
], false);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
// If first network is IPv4, add IPv6 as secondary
|
|
122
|
+
setFieldValue('machineNetworks', [...values.machineNetworks, { cidr: cidrIPv6, clusterId: clusterId }], false);
|
|
123
|
+
}
|
|
64
124
|
}
|
|
65
125
|
if (values.clusterNetworks && ((_b = values.clusterNetworks) === null || _b === void 0 ? void 0 : _b.length) < 2) {
|
|
66
126
|
setFieldValue('clusterNetworks', [
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,uDAA6F;AAC7F,mCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js
CHANGED
|
@@ -6,6 +6,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
|
|
|
6
6
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const formik_1 = require("formik");
|
|
8
8
|
const common_1 = require("../../../../common");
|
|
9
|
+
const ip_address_1 = require("ip-address");
|
|
9
10
|
const toFormSelectOptions = (subnets) => {
|
|
10
11
|
return subnets.map((hn, index) => ({
|
|
11
12
|
label: `${hn.humanized}${hn.isValid ? '' : ' (Invalid network)'}`,
|
|
@@ -26,14 +27,18 @@ const noSubnetAvailableOption = {
|
|
|
26
27
|
isDisabled: true,
|
|
27
28
|
id: 'form-input-hostSubnet-field-option-no-subnet-available',
|
|
28
29
|
};
|
|
29
|
-
const SubnetsDropdown = (
|
|
30
|
+
const SubnetsDropdown = (_a) => {
|
|
31
|
+
var { name, machineSubnets, isDisabled } = _a, props = tslib_1.__rest(_a, ["name", "machineSubnets", "isDisabled"]);
|
|
30
32
|
const [field, , { setValue }] = (0, formik_1.useField)(name);
|
|
31
33
|
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
32
34
|
const fieldId = (0, common_1.getFieldId)(name, 'input');
|
|
33
|
-
const { itemsSubnets, currentDisplayValue } = react_1.default.useMemo(() => {
|
|
35
|
+
const { itemsSubnets, ipv4Subnets, ipv6Subnets, currentDisplayValue } = react_1.default.useMemo(() => {
|
|
34
36
|
const itemsSubnets = machineSubnets.length === 0
|
|
35
37
|
? [noSubnetAvailableOption]
|
|
36
38
|
: [makeNoSubnetSelectedOption(machineSubnets.length)].concat(toFormSelectOptions(machineSubnets));
|
|
39
|
+
// Separate IPv4 and IPv6 subnets
|
|
40
|
+
const ipv4Subnets = machineSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
|
|
41
|
+
const ipv6Subnets = machineSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
37
42
|
let currentDisplayValue = itemsSubnets[0].label; // The placeholder is the fallback
|
|
38
43
|
if (field.value) {
|
|
39
44
|
const subnetItem = itemsSubnets.find((item) => item.value === field.value);
|
|
@@ -45,15 +50,35 @@ const SubnetsDropdown = ({ name, machineSubnets, isDisabled }) => {
|
|
|
45
50
|
// When there is only one subnet, it's selected by default. We skip the placeholder at index 0.
|
|
46
51
|
currentDisplayValue = itemsSubnets[1].label;
|
|
47
52
|
}
|
|
48
|
-
return { itemsSubnets, currentDisplayValue: currentDisplayValue };
|
|
53
|
+
return { itemsSubnets, ipv4Subnets, ipv6Subnets, currentDisplayValue: currentDisplayValue };
|
|
49
54
|
}, [machineSubnets, field.value]);
|
|
50
|
-
const dropdownItems =
|
|
55
|
+
const dropdownItems = react_1.default.useMemo(() => {
|
|
56
|
+
if (machineSubnets.length === 0) {
|
|
57
|
+
return [
|
|
58
|
+
react_1.default.createElement(react_core_1.DropdownItem, { key: noSubnetAvailableOption.value, id: noSubnetAvailableOption.value, isDisabled: noSubnetAvailableOption.isDisabled, value: noSubnetAvailableOption.value }, noSubnetAvailableOption.label),
|
|
59
|
+
];
|
|
60
|
+
}
|
|
61
|
+
const hasIpv4 = ipv4Subnets.length > 0;
|
|
62
|
+
const hasIpv6 = ipv6Subnets.length > 0;
|
|
63
|
+
// If we have both IPv4 and IPv6, group them
|
|
64
|
+
if (hasIpv4 && hasIpv6) {
|
|
65
|
+
const ipv4Items = toFormSelectOptions(ipv4Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
66
|
+
const ipv6Items = toFormSelectOptions(ipv6Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
67
|
+
return [
|
|
68
|
+
react_1.default.createElement(react_core_1.DropdownItem, { key: makeNoSubnetSelectedOption(machineSubnets.length).value, id: makeNoSubnetSelectedOption(machineSubnets.length).value, isDisabled: makeNoSubnetSelectedOption(machineSubnets.length).isDisabled, value: makeNoSubnetSelectedOption(machineSubnets.length).value }, makeNoSubnetSelectedOption(machineSubnets.length).label),
|
|
69
|
+
react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv4", key: "ipv4-group" }, ipv4Items),
|
|
70
|
+
react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv6", key: "ipv6-group" }, ipv6Items),
|
|
71
|
+
];
|
|
72
|
+
}
|
|
73
|
+
// If only one type, don't group
|
|
74
|
+
return itemsSubnets.map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
75
|
+
}, [machineSubnets, ipv4Subnets, ipv6Subnets, itemsSubnets]);
|
|
51
76
|
const onSelect = (event) => {
|
|
52
77
|
setValue(event === null || event === void 0 ? void 0 : event.currentTarget.id);
|
|
53
78
|
setOpen(false);
|
|
54
79
|
};
|
|
55
|
-
const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, { ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, isDisabled: isDisabled, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' }
|
|
56
|
-
return (react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, onOpenChange: () => setOpen(
|
|
80
|
+
const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, Object.assign({ ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, isDisabled: isDisabled, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, props), currentDisplayValue));
|
|
81
|
+
return (react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, onOpenChange: (isOpen) => setOpen(isOpen), onSelect: onSelect, toggle: toggle, isOpen: isOpen }), dropdownItems));
|
|
57
82
|
};
|
|
58
83
|
exports.SubnetsDropdown = SubnetsDropdown;
|
|
59
84
|
//# sourceMappingURL=SubnetsDropdown.js.map
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"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"}
|