@openshift-assisted/ui-lib 2.16.3-cim → 2.16.4-cim

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostSelectionStep.tsx → ClusterDeploymentHostSelectionStep.tsx}

@@ -10,28 +10,28 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import { Alerts, ClusterWizardStepHeader, useAlerts } from '../../../../common';
+import { Alerts, ClusterWizardStepHeader, useAlerts } from '../../../common';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
-} from '../../../types';
+} from '../../types';
 import ClusterDeploymentHostsSelection from './ClusterDeploymentHostsSelection';
 import {
   ClusterDeploymentHostSelectionStepProps,
   ClusterDeploymentHostsSelectionValues,
-} from '../types';
-import { hostCountValidationSchema } from '../validationSchemas';
+} from './types';
+import { hostCountValidationSchema } from './validationSchemas';
 import {
   getAgentSelectorFieldsFromAnnotations,
   getIsSNOCluster,
   getWizardStepAgentStatus,
-} from '../../helpers';
-import { canNextFromHostSelectionStep } from '../wizardTransition';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+} from '../helpers';
+import { canNextFromHostSelectionStep } from './wizardTransition';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
-import { ValidationSection } from '../components/ValidationSection';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
 const getInitialValues = ({
   agents,
@@ -45,12 +45,9 @@ const getInitialValues = ({
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
   const cdName = clusterDeployment?.metadata?.name;
   const cdNamespace = clusterDeployment?.metadata?.namespace;
-
   let hostCount =
     (agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents || 0) +
-    (agentClusterInstall?.spec?.provisionRequirements?.arbiterAgents || 0) +
     (agentClusterInstall?.spec?.provisionRequirements?.workerAgents || 0);
-
   if (isSNOCluster) {
     hostCount = 1;
   } else if (hostCount === 2 || hostCount === 0) {
@@ -258,7 +255,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   const errorsSection = (
     <ValidationSection currentStepId={'cluster-details'} hosts={[]}>
       {syncError && (
-        <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+        <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
           {syncError}
         </Alert>
       )}
@@ -337,9 +334,10 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   );
 };
 
-export const ClusterDeploymentHostSelectionStep: React.FC<
-  ClusterDeploymentHostSelectionStepProps
-> = ({ onSaveHostsSelection, ...rest }) => {
+const ClusterDeploymentHostSelectionStep: React.FC<ClusterDeploymentHostSelectionStepProps> = ({
+  onSaveHostsSelection,
+  ...rest
+}) => {
   const { t } = useTranslation();
 
   const { addAlert } = useAlerts();
@@ -379,3 +377,5 @@ export const ClusterDeploymentHostSelectionStep: React.FC<
     </Formik>
   );
 };
+
+export default ClusterDeploymentHostSelectionStep;

package/lib/cim/components/ClusterDeployment/{hostDiscovery/ClusterDeploymentHostsDiscovery.tsx → ClusterDeploymentHostsDiscovery.tsx}

@@ -1,51 +1,43 @@
 import React from 'react';
-import {
-  Grid,
-  GridItem,
-  TextContent,
-  Text,
-  TextListItem,
-  OrderType,
-  TextList,
-} from '@patternfly/react-core';
+import { Grid, GridItem, Content, OrderType } from '@patternfly/react-core';
 import Measure from 'react-measure';
 import {
   DiscoveryTroubleshootingModal,
   FormatDiskWarning,
   HostsNotShowingLink,
   VMRebootConfigurationInfo,
-} from '../../../../common';
-import { getIsSNOCluster, onAgentChangeHostname } from '../../helpers';
-import MinimalHWRequirements from '../../Agent/MinimalHWRequirements';
-import { ClusterDeploymentHostsDiscoveryProps } from '../types';
-import { EditBMHModal, EditAgentModal } from '../../modals';
-import { AgentK8sResource, BareMetalHostK8sResource } from '../../../types';
+} from '../../../common';
+import { getIsSNOCluster, onAgentChangeHostname } from '../helpers';
+import MinimalHWRequirements from '../Agent/MinimalHWRequirements';
+import { ClusterDeploymentHostsDiscoveryProps } from './types';
+import { EditBMHModal, EditAgentModal } from '../modals';
+import { AgentK8sResource, BareMetalHostK8sResource } from '../../types';
 import ClusterDeploymentHostDiscoveryTable from './ClusterDeploymentHostDiscoveryTable';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import AddHostDropdown from '../../InfraEnv/AddHostDropdown';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import AddHostDropdown from '../InfraEnv/AddHostDropdown';
 
 const DiscoveryInstructions = () => {
   const { t } = useTranslation();
   return (
-    <TextContent>
-      <Text component="h3">{t('ai:Adding hosts instructions')}</Text>
-      <TextList component="ol" type={OrderType.number} style={{ marginLeft: 0 }}>
-        <TextListItem>{t('ai:Click the Add hosts button.')}</TextListItem>
-        <TextListItem>
+    <>
+      <Content component="h3">{t('ai:Adding hosts instructions')}</Content>
+      <Content component="ol" type={OrderType.number} style={{ marginLeft: 0 }}>
+        <Content component="li">{t('ai:Click the Add hosts button.')}</Content>
+        <Content component="li">
           {t('ai:Configure the SSH key and proxy settings after the modal appears (optional).')}
-        </TextListItem>
-        <TextListItem>
+        </Content>
+        <Content component="li">
           {t(
             "ai:Select how you'd like to add hosts (Discovery ISO, iPXE, or BMC form) and follow the instructions that appear.",
           )}
-        </TextListItem>
-        <TextListItem>
+        </Content>
+        <Content component="li">
           {t(
             'ai:Booted hosts should appear in the host inventory table. This may take a few minutes.',
           )}
-        </TextListItem>
-      </TextList>
-    </TextContent>
+        </Content>
+      </Content>
+    </>
   );
 };
 
@@ -78,9 +70,7 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
   return (
     <Grid hasGutter>
       <GridItem>
-        <TextContent>
-          <DiscoveryInstructions />
-        </TextContent>
+        <DiscoveryInstructions />
       </GridItem>
       <GridItem span={5}>
         <AddHostDropdown
@@ -91,18 +81,18 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
         />
       </GridItem>
       <GridItem>
-        <TextContent>
-          <Text component="h3">{t('ai:Information and warnings')}</Text>
+        <Content>
+          <Content component="h3">{t('ai:Information and warnings')}</Content>
           {aiConfigMap && (
-            <Text component="p">
+            <Content component="p">
               <MinimalHWRequirements aiConfigMap={aiConfigMap} isSNOCluster={isSNOCluster} />
-            </Text>
+            </Content>
           )}
-          <Text component="p">
+          <Content component="p">
             <HostsNotShowingLink setDiscoveryHintModalOpen={setDiscoveryHintModalOpen} />
-          </Text>
+          </Content>
           {isVM && <VMRebootConfigurationInfo />}
-        </TextContent>
+        </Content>
       </GridItem>
       <GridItem>
         {/* <OCSDisksManualFormattingHint /> Recently not used in the ACM flow */}

package/lib/cim/components/ClusterDeployment/{hostDiscovery/ClusterDeploymentHostsDiscoveryStep.tsx → ClusterDeploymentHostsDiscoveryStep.tsx}

@@ -12,17 +12,17 @@ import {
   useWizardContext,
 } from '@patternfly/react-core';
 
-import { Alerts, ClusterWizardStepHeader } from '../../../../common';
-import { ClusterDeploymentHostsDiscoveryStepProps } from '../types';
+import { Alerts, ClusterWizardStepHeader } from '../../../common';
+import { ClusterDeploymentHostsDiscoveryStepProps } from './types';
 import ClusterDeploymentHostsDiscovery from './ClusterDeploymentHostsDiscovery';
-import { getAgentsHostsNames, isAgentOfInfraEnv } from '../helpers';
-import { getIsSNOCluster, getWizardStepAgentStatus } from '../../helpers';
-import { canNextFromHostDiscoveryStep } from '../wizardTransition';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { ValidationSection } from '../components/ValidationSection';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { getAgentsHostsNames, isAgentOfInfraEnv } from './helpers';
+import { getIsSNOCluster, getWizardStepAgentStatus } from '../helpers';
+import { canNextFromHostDiscoveryStep } from './wizardTransition';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
-export const ClusterDeploymentHostsDiscoveryStep = ({
+const ClusterDeploymentHostsDiscoveryStep = ({
   agentClusterInstall,
   agents: allAgents,
   infraEnv,
@@ -174,7 +174,7 @@ export const ClusterDeploymentHostsDiscoveryStep = ({
       {!!syncError && (
         <GridItem>
           <ValidationSection currentStepId={'hosts-selection'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -183,3 +183,4 @@ export const ClusterDeploymentHostsDiscoveryStep = ({
     </Grid>
   );
 };
+export default ClusterDeploymentHostsDiscoveryStep;

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentHostsNetworkTable.tsx → ClusterDeploymentHostsNetworkTable.tsx}

@@ -1,26 +1,26 @@
 import * as React from 'react';
 import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
-import { EmptyState } from '../../../../common';
-import { AgentTableActions } from '../types';
+import { EmptyState } from '../../../common';
+import { AgentTableActions } from './types';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
-} from '../../../types';
-import { getAICluster, getIsSNOCluster } from '../../helpers';
-import { AdditionalNTPSourcesDialogToggle } from '../components/AdditionalNTPSourcesDialogToggle';
-import { agentStatusColumn, useAgentsTable } from '../../Agent/tableUtils';
-import HostsTable from '../../../../common/components/hosts/HostsTable';
-import { HostDetail } from '../../../../common/components/hosts/HostRowDetail';
+} from '../../types';
+import { getAICluster, getIsSNOCluster } from '../helpers';
+import { AdditionalNTPSourcesDialogToggle } from './AdditionalNTPSourcesDialogToggle';
+import { agentStatusColumn, useAgentsTable } from '../Agent/tableUtils';
+import HostsTable from '../../../common/components/hosts/HostsTable';
+import { HostDetail } from '../../../common/components/hosts/HostRowDetail';
 import {
   activeNICColumn,
   hostnameColumn,
   roleColumn,
-} from '../../../../common/components/hosts/tableUtils';
-import { usePagination } from '../../../../common/components/hosts/usePagination';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+} from '../../../common/components/hosts/tableUtils';
+import { usePagination } from '../../../common/components/hosts/usePagination';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
-import { agentStatus } from '../../helpers/agentStatus';
+import { agentStatus } from '../helpers/agentStatus';
 
 type ExpandComponentContextType = {
   onSetInstallationDiskId?: ClusterDeploymentHostsNetworkTableProps['onSetInstallationDiskId'];

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelection.tsx → ClusterDeploymentHostsSelection.tsx}

@@ -1,36 +1,21 @@
 import React from 'react';
 import { useFormikContext } from 'formik';
-import { Grid, GridItem, TextContent, Form } from '@patternfly/react-core';
-import { SwitchField } from '../../../../common';
+import { Grid, GridItem, Content, Form } from '@patternfly/react-core';
+import { SwitchField } from '../../../common';
 import {
   ClusterDeploymentHostsSelectionProps,
   ClusterDeploymentHostsSelectionValues,
-} from '../types';
+} from './types';
 import ClusterDeploymentHostsSelectionBasic from './ClusterDeploymentHostsSelectionBasic';
-import { ClusterDeploymentHostsSelectionAdvanced } from './ClusterDeploymentHostsSelectionAdvanced';
+import ClusterDeploymentHostsSelectionAdvanced from './ClusterDeploymentHostsSelectionAdvanced';
 import {
   getAgentsForSelection,
   getClusterDeploymentCpuArchitecture,
   getIsSNOCluster,
-  getIsTNACluster,
-} from '../../helpers';
-import MinimalHWRequirements from '../../Agent/MinimalHWRequirements';
-import NoAgentsAlert from '../../Agent/NoAgentsAlert';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { TFunction } from 'i18next';
-
-const getHostRequirementText = (isSNO: boolean, isTNA: boolean, t: TFunction) => {
-  if (isSNO) {
-    return t(
-      'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
-    );
-  } else if (isTNA) {
-    return t(
-      'ai:Exactly 2 hosts capable of functioning as control plane nodes, and one arbiter, are required.',
-    );
-  }
-  return t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.');
-};
+} from '../helpers';
+import MinimalHWRequirements from '../Agent/MinimalHWRequirements';
+import NoAgentsAlert from '../Agent/NoAgentsAlert';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionProps> = ({
   agentClusterInstall,
@@ -43,11 +28,9 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   onSetInstallationDiskId,
   isNutanix,
 }) => {
-  const { t } = useTranslation();
   const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
   const { autoSelectHosts } = values;
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
-  const isTNA = getIsTNACluster(agentClusterInstall);
 
   const cdName = clusterDeployment?.metadata?.name;
   const cdNamespace = clusterDeployment?.metadata?.namespace;
@@ -62,20 +45,22 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
           !agent.spec.clusterDeploymentName?.namespace &&
           agent.status?.inventory.cpu?.architecture === cpuArchitecture),
     );
-
     return isNutanix
       ? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
       : filtered;
   }, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
-
-  const hostRequirementText = getHostRequirementText(isSNOCluster, isTNA, t);
-
+  const { t } = useTranslation();
   return (
     <Grid hasGutter>
       <GridItem>
-        <TextContent>{hostRequirementText}</TextContent>
+        <Content>
+          {isSNOCluster
+            ? t(
+                'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
+              )
+            : t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.')}
+        </Content>
       </GridItem>
-
       {aiConfigMap && (
         <GridItem>
           <MinimalHWRequirements aiConfigMap={aiConfigMap} isSNOCluster={isSNOCluster} />

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelectionAdvanced.tsx → ClusterDeploymentHostsSelectionAdvanced.tsx}

@@ -4,15 +4,15 @@ import React from 'react';
 import Measure from 'react-measure';
 import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
 
-import { AgentK8sResource } from '../../../types';
-import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../../common';
-import LocationsSelector from '../LocationsSelector';
-import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from '../types';
-import LabelsSelector, { infraEnvLabelKeys } from '../LabelsSelector';
-import AgentsSelectionTable from '../../Agent/AgentsSelectionTable';
-import { AgentTableActions } from '../types';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { CpuArchitecture } from '../../../../common';
+import { AgentK8sResource } from '../../types';
+import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../common';
+import LocationsSelector from './LocationsSelector';
+import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from './types';
+import LabelsSelector, { infraEnvLabelKeys } from './LabelsSelector';
+import AgentsSelectionTable from '../Agent/AgentsSelectionTable';
+import { AgentTableActions } from './types';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { CpuArchitecture } from '../../../common';
 
 type ClusterDeploymentHostsSelectionAdvancedProps = {
   availableAgents: AgentK8sResource[];
@@ -25,7 +25,7 @@ type ClusterDeploymentHostsSelectionAdvancedProps = {
 
 type FormValues = ClusterDeploymentHostsSelectionValues | ScaleUpFormValues;
 
-export const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
+const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
   availableAgents,
   onEditRole,
   onSetInstallationDiskId,
@@ -103,3 +103,5 @@ export const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
     </>
   );
 };
+
+export default ClusterDeploymentHostsSelectionAdvanced;

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelectionBasic.tsx → ClusterDeploymentHostsSelectionBasic.tsx}

@@ -1,15 +1,15 @@
 import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
-import { CheckboxField, NumberInputField } from '../../../../common';
-import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from '../constants';
+import { CheckboxField, NumberInputField } from '../../../common';
+import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from './constants';
 import { useFormikContext } from 'formik';
-import { ClusterDeploymentHostsSelectionValues } from '../types';
-import LocationsSelector from '../LocationsSelector';
-import { AgentK8sResource } from '../../../types';
-import AgentsSelectionHostCountAlerts from '../../Agent/AgentsSelectionHostCountAlerts';
-import AgentsSelectionHostCountLabelIcon from '../../Agent/AgentsSelectionHostCountLabelIcon';
-import { useAgentsAutoSelection } from '../../Agent/AgentsSelectionUtils';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentHostsSelectionValues } from './types';
+import LocationsSelector from './LocationsSelector';
+import { AgentK8sResource } from '../../types';
+import AgentsSelectionHostCountAlerts from '../Agent/AgentsSelectionHostCountAlerts';
+import AgentsSelectionHostCountLabelIcon from '../Agent/AgentsSelectionHostCountLabelIcon';
+import { useAgentsAutoSelection } from '../Agent/AgentsSelectionUtils';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type ClusterDeploymentHostsSelectionBasicProps = {
   availableAgents: AgentK8sResource[];

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentNetworkingForm.tsx → ClusterDeploymentNetworkingForm.tsx}

@@ -5,9 +5,8 @@ import {
   Grid,
   GridItem,
   Spinner,
-  Text,
-  TextContent,
-  TextVariants,
+  Content,
+  ContentVariants,
   Checkbox,
   Split,
   SplitItem,
@@ -20,21 +19,25 @@ import {
   SecurityFields,
   ProxyFields,
   ProxyInputFields,
-} from '../../../../common';
-import NetworkConfiguration from '../NetworkConfiguration';
+} from '../../../common';
+import NetworkConfiguration from './NetworkConfiguration';
 import ClusterDeploymentHostsNetworkTable from './ClusterDeploymentHostsNetworkTable';
-import { getAICluster, getIsSNOCluster } from '../../helpers';
+import { getAICluster, getIsSNOCluster } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
-} from '../../../types';
-import { AgentTableActions, ClusterDeploymentNetworkingValues } from '../types';
+} from '../../types';
+import { AgentTableActions, ClusterDeploymentNetworkingValues } from './types';
 import { useFormikContext } from 'formik';
-import { getGridSpans } from '../helpers';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { getGridSpans } from './helpers';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
+import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
+
+// TODO(mlibra): So far a constant. Should be queried from somewhere.
+export const defaultNetworkSettings: ClusterDefaultConfig = CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4;
 
 type ClusterDeploymentNetworkingFormProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -96,16 +99,14 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
     if (!sameProxies) {
       proxyConfig = (
         <>
-          <TextContent>
-            <Text component="h2">{t('ai:Cluster-wide proxy')}</Text>
-            <Text component={TextVariants.p}>
-              <Trans
-                t={t}
-                components={{ bold: <strong /> }}
-                i18nKey="ai:The hosts you selected are using different proxy settings. Configure a proxy that will be applied for these hosts. <bold>Configure at least one of the proxy settings below.</bold>"
-              />
-            </Text>
-          </TextContent>
+          <Content component="h2">{t('ai:Cluster-wide proxy')}</Content>
+          <Content component={ContentVariants.p}>
+            <Trans
+              t={t}
+              components={{ bold: <strong /> }}
+              i18nKey="ai:The hosts you selected are using different proxy settings. Configure a proxy that will be applied for these hosts. <bold>Configure at least one of the proxy settings below.</bold>"
+            />
+          </Content>
           <ProxyInputFields />
         </>
       );
@@ -136,7 +137,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 cluster={cluster}
                 hostSubnets={hostSubnets}
                 isVipDhcpAllocationDisabled
-                defaultNetworkSettings={CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4}
+                defaultNetworkSettings={defaultNetworkSettings}
                 hideManagedNetworking={getIsSNOCluster(agentClusterInstall) || isNutanix}
               />
             </GridItem>
@@ -160,9 +161,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
           <SecurityFields clusterSshKey={cluster.sshPublicKey} />
         </StackItem>
         <StackItem>
-          <TextContent>
-            <Text component="h2">{t('ai:Host inventory')}</Text>
-          </TextContent>
+          <Content component="h2">{t('ai:Host inventory')}</Content>
           <ClusterDeploymentHostsNetworkTable
             clusterDeployment={clusterDeployment}
             agentClusterInstall={agentClusterInstall}

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentNetworkingStep.tsx → ClusterDeploymentNetworkingStep.tsx}

@@ -17,21 +17,21 @@ import {
   getFormikErrorFields,
   clusterFieldLabels,
   Alerts,
-} from '../../../../common';
+} from '../../../common';
 
 import {
   ClusterDeploymentDetailsNetworkingProps,
   AgentTableActions,
   ClusterDeploymentNetworkingValues,
-} from '../types';
+} from './types';
 import ClusterDeploymentNetworkingForm from './ClusterDeploymentNetworkingForm';
-import { isAgentOfCluster } from '../helpers';
-import { useInfraEnvProxies, useNetworkingFormik } from '../use-networking-formik';
-import { canNextFromNetworkingStep } from '../wizardTransition';
-import { AgentK8sResource } from '../../../types';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { ValidationSection } from '../components/ValidationSection';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { isAgentOfCluster } from './helpers';
+import { useInfraEnvProxies, useNetworkingFormik } from './use-networking-formik';
+import { canNextFromNetworkingStep } from './wizardTransition';
+import { AgentK8sResource } from '../../types';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
 type NetworkingFormProps = {
   clusterDeployment: ClusterDeploymentDetailsNetworkingProps['clusterDeployment'];
@@ -200,7 +200,7 @@ export const NetworkingForm = ({
         {syncError && (
           <GridItem>
             <ValidationSection currentStepId={'networking'} hosts={[]}>
-              <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+              <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
                 {syncError}
               </Alert>
             </ValidationSection>
@@ -212,7 +212,7 @@ export const NetworkingForm = ({
   );
 };
 
-export const ClusterDeploymentNetworkingStep = ({
+const ClusterDeploymentNetworkingStep = ({
   clusterDeployment,
   agentClusterInstall,
   agents,
@@ -261,3 +261,5 @@ export const ClusterDeploymentNetworkingStep = ({
     </Formik>
   );
 };
+
+export default ClusterDeploymentNetworkingStep;