@openshift-assisted/ui-lib 2.8.2-cim → 2.9.0-cim

package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx

@@ -1,14 +1,19 @@
-import { Grid, GridItem } from '@patternfly/react-core';
+import { Alert, Grid, GridItem } from '@patternfly/react-core';
 import { Form, Formik } from 'formik';
 import React from 'react';
 import {
   Cluster,
+  ClusterCpuArchitecture,
   ClusterWizardStep,
   ClusterWizardStepHeader,
   CpuArchitecture,
   ErrorState,
+  ExternalLink,
   getSupportedCpuArchitectures,
+  HOW_TO_KNOW_IF_CLUSTER_SUPPORTS_MULTIPLE_CPU_ARCHS,
+  InfraEnv,
   LoadingState,
+  SupportedCpuArchitecture,
   useFeature,
 } from '../../../../common';
 import { HostsNetworkConfigurationType, InfraEnvsService } from '../../../services';
@@ -21,24 +26,50 @@ import Day2WizardFooter from './Day2WizardFooter';
 import Day2HostStaticIpConfigurations from './Day2StaticIpHostConfigurations';
 import { mapClusterCpuArchToInfraEnvCpuArch } from '../../../services/CpuArchitectureService';
 import CpuArchitectureDropdown from '../../clusterConfiguration/CpuArchitectureDropdown';
-import { useOpenshiftVersions } from '../../../hooks';
+import { useOpenshiftVersions, usePullSecret } from '../../../hooks';
 
 const getDay2ClusterDetailInitialValues = async (
   clusterId: Cluster['id'],
   day1CpuArchitecture: CpuArchitecture,
-) => {
+  pullSecret?: string,
+  name?: string,
+  openshiftVersion?: string,
+): Promise<Day2ClusterDetailValues | Error> => {
   try {
     const infraEnv = await InfraEnvsService.getInfraEnv(clusterId, day1CpuArchitecture);
-
-    return {
-      cpuArchitecture: day1CpuArchitecture,
-      hostsNetworkConfigurationType: infraEnv.staticNetworkConfig
-        ? HostsNetworkConfigurationType.STATIC
-        : HostsNetworkConfigurationType.DHCP,
-    };
+    if (infraEnv && !(infraEnv instanceof Error)) {
+      return {
+        cpuArchitecture: day1CpuArchitecture as SupportedCpuArchitecture,
+        hostsNetworkConfigurationType: infraEnv.staticNetworkConfig
+          ? HostsNetworkConfigurationType.STATIC
+          : HostsNetworkConfigurationType.DHCP,
+      };
+    } else {
+      //Create a new InfraEnv because is not found
+      if (pullSecret) {
+        const infraEnv = await InfraEnvsService.create({
+          name: InfraEnvsService.makeInfraEnvName(
+            day1CpuArchitecture as ClusterCpuArchitecture,
+            name,
+          ),
+          pullSecret,
+          clusterId,
+          openshiftVersion,
+          cpuArchitecture: day1CpuArchitecture as ClusterCpuArchitecture,
+        });
+        return {
+          cpuArchitecture: day1CpuArchitecture as SupportedCpuArchitecture,
+          hostsNetworkConfigurationType: infraEnv.staticNetworkConfig
+            ? HostsNetworkConfigurationType.STATIC
+            : HostsNetworkConfigurationType.DHCP,
+        };
+      } else {
+        return new Error('Could not get infraEnv for this cpu architecture');
+      }
+    }
   } catch (error) {
     handleApiError(error);
-    return null;
+    return new Error('Could not get infraEnv for this cpu architecture');
   }
 };
 
@@ -49,15 +80,16 @@ const Day2ClusterDetails = () => {
     data: { cluster: day2Cluster },
   } = day2DiscoveryImageDialog;
   const wizardContext = useDay2WizardContext();
-  const [initialValues, setInitialValues] = React.useState<
-    Day2ClusterDetailValues | Error | null
-  >();
+  const [initialValues, setInitialValues] = React.useState<Day2ClusterDetailValues | null>(null);
   const [isSubmitting, setSubmitting] = React.useState(false);
-
+  const [isAlternativeCpuSelected, setIsAlternativeCpuSelected] = React.useState(false);
   const canSelectCpuArch = useFeature('ASSISTED_INSTALLER_MULTIARCH_SUPPORTED');
   const { getCpuArchitectures } = useOpenshiftVersions();
   const cpuArchitecturesByVersionImage = getCpuArchitectures(day2Cluster.openshiftVersion);
   const day1CpuArchitecture = mapClusterCpuArchToInfraEnvCpuArch(day2Cluster.cpuArchitecture);
+  const [errorState, setErrorState] = React.useState<Error | null>(null);
+  const pullSecret = usePullSecret();
+
   const cpuArchitectures = React.useMemo(
     () =>
       getSupportedCpuArchitectures(
@@ -72,13 +104,26 @@ const Day2ClusterDetails = () => {
       const initialValues = await getDay2ClusterDetailInitialValues(
         day2Cluster.id,
         day1CpuArchitecture,
+        pullSecret,
+        day2Cluster.name,
+        day2Cluster.openshiftVersion,
       );
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      setInitialValues(initialValues);
+      if (initialValues instanceof Error) {
+        setErrorState(initialValues);
+      } else {
+        setInitialValues(initialValues);
+      }
     };
     void fetchAndSetInitialValues();
-  }, [day2Cluster.id, day1CpuArchitecture]);
+  }, [
+    day2Cluster.id,
+    day1CpuArchitecture,
+    pullSecret,
+    day2Cluster.name,
+    day2Cluster.openshiftVersion,
+  ]);
 
   const handleSubmit = React.useCallback(
     async (values: Day2ClusterDetailValues) => {
@@ -102,10 +147,54 @@ const Day2ClusterDetails = () => {
     [day2Cluster.id, wizardContext],
   );
 
-  if (!initialValues) {
+  const changeCpuArchitectureDropdownAsync = React.useCallback(
+    async (value: string, initialValues: Day2ClusterDetailValues) => {
+      if (!pullSecret) {
+        setErrorState(new Error('Pull secret is missing'));
+      } else {
+        if (value !== initialValues.cpuArchitecture) {
+          //Fetch infraEnv by clusterId and cpu architecture
+          let infraEnv: InfraEnv | Error;
+          try {
+            infraEnv = await InfraEnvsService.getInfraEnv(
+              day2Cluster.id,
+              value as SupportedCpuArchitecture,
+            );
+            if (!infraEnv) {
+              try {
+                infraEnv = await InfraEnvsService.create({
+                  name: InfraEnvsService.makeInfraEnvName(
+                    value as ClusterCpuArchitecture,
+                    day2Cluster.name,
+                  ),
+                  pullSecret,
+                  clusterId: day2Cluster.id,
+                  openshiftVersion: day2Cluster.openshiftVersion,
+                  cpuArchitecture: value as ClusterCpuArchitecture,
+                });
+              } catch {
+                setErrorState(new Error('Could not get infraEnv for this cpu architecture'));
+              }
+            }
+          } catch {
+            setErrorState(new Error('Could not get infraEnv for this cpu architecture'));
+          }
+        }
+      }
+      setIsAlternativeCpuSelected(value !== initialValues.cpuArchitecture);
+    },
+    [day2Cluster.id, day2Cluster.name, day2Cluster.openshiftVersion, pullSecret],
+  );
+  const handleChangeCpuArchitectureDropdown = React.useCallback(
+    (value: string, initialValues: Day2ClusterDetailValues) =>
+      void changeCpuArchitectureDropdownAsync(value, initialValues),
+    [changeCpuArchitectureDropdownAsync],
+  );
+
+  if (initialValues === null) {
     return <LoadingState />;
-  } else if (initialValues instanceof Error) {
-    return <ErrorState content="Failed to load associated data for the Day2 cluster" />;
+  } else if (errorState !== null) {
+    return <ErrorState content={errorState.message} />;
   }
 
   return (
@@ -129,13 +218,32 @@ const Day2ClusterDetails = () => {
                 <GridItem>
                   <ClusterWizardStepHeader>Cluster details</ClusterWizardStepHeader>
                 </GridItem>
-                <GridItem span={12} lg={10} xl={9} xl2={7}>
+                <GridItem span={12} xl={10}>
                   <CpuArchitectureDropdown
                     openshiftVersion={day2Cluster.openshiftVersion}
                     day1CpuArchitecture={initialValues.cpuArchitecture}
                     cpuArchitectures={cpuArchitectures}
+                    onChange={(value) => handleChangeCpuArchitectureDropdown(value, initialValues)}
                   />
                 </GridItem>
+                {isAlternativeCpuSelected && (
+                  <GridItem span={12} xl={10}>
+                    <Alert
+                      isInline
+                      variant="info"
+                      title={
+                        'To check if the current version of your cluster supports multiple CPU architectures,'
+                      }
+                    >
+                      <>
+                        <ExternalLink href={HOW_TO_KNOW_IF_CLUSTER_SUPPORTS_MULTIPLE_CPU_ARCHS}>
+                          follow these steps
+                        </ExternalLink>
+                      </>
+                    </Alert>
+                  </GridItem>
+                )}
+
                 <GridItem>
                   <Day2HostStaticIpConfigurations />
                 </GridItem>

package/lib/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.tsx

@@ -13,7 +13,7 @@ const Day2DownloadISO = () => {
   const wizardContext = useDay2WizardContext();
   const isoDownloadUrl = wizardContext.selectedIsoUrl;
   const ipxeDownloadUrl = wizardContext.selectedIpxeUrl;
-  const nameImageSuffix = `${cluster.name || ''}_${wizardContext.selectedCpuArchitecture}`;
+  const nameImageSuffix = `${cluster.name || ''}`;
   return (
     <ClusterWizardStep navigation={<Day2WizardNav />}>
       <Stack hasGutter>

package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIP.tsx

@@ -65,18 +65,23 @@ const Day2StaticIP = () => {
         setInfraEnv(undefined);
         return;
       }
-
-      if (!infraEnv.staticNetworkConfig) {
-        // Make sure the infraEnv we store in the state has staticIP config
-        // This is required to be able to reuse the StaticIP services
-        infraEnv = await InfraEnvsService.setDummyStaticConfigToInfraEnv(infraEnv.id);
-      }
-      const staticIpInfo = getStaticIpInfo(infraEnv);
-      if (staticIpInfo) {
-        setInfraEnv(infraEnv);
-        setInitialStaticIpInfo(staticIpInfo);
+      if (infraEnv && !(infraEnv instanceof Error)) {
+        if (!infraEnv.staticNetworkConfig) {
+          // Make sure the infraEnv we store in the state has staticIP config
+          // This is required to be able to reuse the StaticIP services
+          infraEnv = await InfraEnvsService.setDummyStaticConfigToInfraEnv(infraEnv.id);
+        }
+        const staticIpInfo = getStaticIpInfo(infraEnv);
+        if (staticIpInfo) {
+          setInfraEnv(infraEnv);
+          setInitialStaticIpInfo(staticIpInfo);
+        } else {
+          setHasLoadError(true);
+        }
       } else {
         setHasLoadError(true);
+        setInfraEnv(undefined);
+        return;
       }
     };
     void setCurrentStaticConfig();

package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx

@@ -41,6 +41,7 @@ const Day2Wizard = () => {
       variant={ModalVariant.large}
       showClose={false}
       hasNoBodyWrapper
+      id="generate-discovery-iso-modal"
     >
       <div className={classNames('pf-c-wizard', 'cluster-wizard')}>
         <WizardHeader

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx

@@ -18,6 +18,7 @@ import { AddHosts } from '../AddHosts';
 import { HostsClusterDetailTabProps } from './types';
 import { NewFeatureSupportLevelProvider } from '../newFeatureSupportLevels';
 import useInfraEnv from '../../hooks/useInfraEnv';
+import { mapOcmArchToCpuArchitecture } from '../../services/CpuArchitectureService';
 
 export const HostsClusterDetailTabContent = ({
   cluster: ocmCluster,
@@ -37,7 +38,12 @@ export const HostsClusterDetailTabContent = ({
 
   const { infraEnv } = useInfraEnv(
     ocmCluster.id ? ocmCluster.id : '',
-    CpuArchitecture.USE_DAY1_ARCHITECTURE,
+    ocmCluster.cpu_architecture
+      ? (mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture) as CpuArchitecture)
+      : CpuArchitecture.x86,
+    ocmCluster.name,
+    pullSecret,
+    ocmCluster.openshift_version,
   );
   React.useEffect(() => {
     if (!isVisible && day2Cluster) {
@@ -106,8 +112,6 @@ export const HostsClusterDetailTabContent = ({
             ocmCluster,
             pullSecret,
             normalizedVersion,
-            cpuArchitecturesByVersionImage,
-            canSelectCpuArch,
           );
           const aiCluster = Day2ClusterService.completeAiClusterWithOcmCluster(
             day2Cluster,

package/lib/ocm/components/HostsClusterDetailTab/utils.ts

@@ -29,13 +29,18 @@ const disabledTabResult = (tooltipMessage: string) => ({
 });
 
 export const getAddHostTabDetails = ({ cluster }: { cluster: OcmClusterType }) => {
-  const isHiddenTab =
-    (cluster.state !== 'ready' && cluster.state !== 'installed') ||
-    cluster.product?.id !== 'OCP-AssistedInstall';
+  const isHiddenTab = cluster.state !== 'ready' && cluster.state !== 'installed';
   if (isHiddenTab) {
     return hiddenTabResult;
   }
 
+  // Cluster’s product id is not 'OCP-AssistedInstall'. We show disabled tab with a message
+  if (cluster.product?.id !== 'OCP-AssistedInstall') {
+    return disabledTabResult(
+      'Only clusters installed with Assisted Installer can be scaled up using the web interface. You can still scale up clusters using the CLI.',
+    );
+  }
+
   // Checking if the Day1 cluster has reported metrics, so it can be determined if it's an SNO / multi node and has required information
   // If that's not the case, we will still show the tab, and the content will be an ErrorState with an explanation message
   const day1ClusterHostCount = cluster.metrics?.nodes?.total || 0;

package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx

@@ -30,12 +30,12 @@ export const architectureData: Record<SupportedCpuArchitecture, CpuArchitectureI
   [CpuArchitecture.ppc64le]: {
     description: 'Some features may not be available',
     featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
-    label: 'PowerPC 64-bit LE',
+    label: 'IBM Power (ppc64le)',
   },
   [CpuArchitecture.s390x]: {
     description: 'Some features may not be available',
     featureSupportLevelId: 'S390X_ARCHITECTURE',
-    label: 'System/390 64-bit',
+    label: 'IBM zSystems (s390x)',
   },
 };
 
@@ -54,12 +54,14 @@ type CpuArchitectureDropdownProps = {
   openshiftVersion: Cluster['openshiftVersion'];
   day1CpuArchitecture?: SupportedCpuArchitecture;
   cpuArchitectures: SupportedCpuArchitecture[];
+  onChange?: (value: string) => void;
 };
 
 const CpuArchitectureDropdown = ({
   openshiftVersion,
   day1CpuArchitecture,
   cpuArchitectures,
+  onChange,
 }: CpuArchitectureDropdownProps) => {
   const [field, { value: selectedCpuArchitecture }, { setValue }] =
     useField<SupportedCpuArchitecture>(INPUT_NAME);
@@ -93,8 +95,9 @@ const CpuArchitectureDropdown = ({
       setValue(selectedCpuArch);
       setOpen(false);
       setCurrentCpuArch(architectureData[selectedCpuArch].label);
+      onChange && onChange(selectedCpuArch);
     },
-    [setOpen, setValue],
+    [setOpen, setValue, onChange],
   );
 
   React.useEffect(() => {

package/lib/ocm/components/clusterConfiguration/DiscoveryImageForm.tsx

@@ -12,6 +12,7 @@ import {
   OcmDiscoveryImageFormValues,
 } from './OcmDiscoveryImageConfigForm';
 import { mapClusterCpuArchToInfraEnvCpuArch } from '../../services/CpuArchitectureService';
+import { usePullSecret } from '../../hooks';
 
 type DiscoveryImageFormProps = {
   cluster: Cluster;
@@ -30,7 +31,14 @@ const DiscoveryImageForm = ({
   onSuccessIpxe,
   isIpxeSelected,
 }: DiscoveryImageFormProps) => {
-  const { infraEnv, error: infraEnvError } = useInfraEnv(cluster.id, cpuArchitecture);
+  const pullSecret = usePullSecret();
+  const { infraEnv, error: infraEnvError } = useInfraEnv(
+    cluster.id,
+    cpuArchitecture,
+    cluster.name,
+    pullSecret,
+    cluster.openshiftVersion,
+  );
   const cancelSourceRef = React.useRef<CancelTokenSource>();
   const dispatch = useDispatch();
 

package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx

@@ -50,8 +50,8 @@ export type OcmDiscoveryImageFormValues = OcmImageCreateParams &
 const validationSchema = Yup.lazy<OcmDiscoveryImageFormValues>((values) =>
   Yup.object<OcmDiscoveryImageFormValues>().shape({
     sshPublicKey: sshPublicKeyListValidationSchema,
-    httpProxy: httpProxyValidationSchema(values, 'httpProxy'),
-    httpsProxy: httpProxyValidationSchema(values, 'httpsProxy'), // share the schema, httpS is currently not supported
+    httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy' }),
+    httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }), // share the schema, httpS is currently not supported
     noProxy: noProxyValidationSchema,
   }),
 );
@@ -131,7 +131,7 @@ export const OcmDiscoveryImageConfigForm = ({
       validationSchema={validationSchema}
       onSubmit={handleSubmit}
     >
-      {({ submitForm, isSubmitting, status }) => {
+      {({ submitForm, isSubmitting, status, setStatus }) => {
         return (
           <>
             <ModalBoxBody>
@@ -142,7 +142,6 @@ export const OcmDiscoveryImageConfigForm = ({
 
                 <StackItem>
                   <Form>
-                    <AlertFormikError status={status as StatusErrorType} />
                     <DiscoveryImageTypeDropdown
                       name="imageType"
                       defaultValue={discoveryImageTypes[imageTypeValue]}
@@ -161,18 +160,28 @@ export const OcmDiscoveryImageConfigForm = ({
               </Stack>
             </ModalBoxBody>
             <ModalBoxFooter>
-              <Button
-                onClick={() => {
-                  void submitForm();
-                }}
-                isDisabled={isSubmitting}
-                isLoading={isSubmitting}
-              >
-                {isSubmitting ? t('ai:Generating') : buttonText}
-              </Button>
-              <Button key="cancel" variant="link" onClick={onCancel}>
-                {t('ai:Cancel')}
-              </Button>
+              <Stack hasGutter style={{ width: '100%' }}>
+                <StackItem>
+                  <AlertFormikError
+                    status={status as StatusErrorType}
+                    onClose={() => setStatus(undefined)}
+                  />
+                </StackItem>
+                <StackItem>
+                  <Button
+                    onClick={() => {
+                      void submitForm();
+                    }}
+                    isDisabled={isSubmitting}
+                    isLoading={isSubmitting}
+                  >
+                    {isSubmitting ? t('ai:Generating') : buttonText}
+                  </Button>
+                  <Button key="cancel" variant="link" onClick={onCancel}>
+                    {t('ai:Cancel')}
+                  </Button>
+                </StackItem>
+              </Stack>
             </ModalBoxFooter>
           </>
         );

package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx

@@ -21,11 +21,14 @@ const getNetworkLabelSuffix = (index: number, isDualStack: boolean) => {
   return isDualStack ? ` (${index === 0 ? 'IPv4' : 'IPv6'})` : '';
 };
 
-const IPv4PrefixHelperText =
-  'The subnet prefix length to assign to each individual node. 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. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.';
+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.';
 
-const IPv6PrefixHelperText =
-  'The subnet prefix length to assign to each individual node. 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. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.';
+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.';
+
+const ClusterPrefixHelperText =
+  'Defines how big the subnets for each individual node are out of the given CIDR. Must enter a whole number.';
 
 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.';
@@ -45,8 +48,18 @@ const AdvancedNetworkFields = () => {
 
   const isSubnetIPv6 = (index: number) => (isDualStack ? !!index : false);
 
-  const clusterNetworkHostPrefixHelperText = (index: number) =>
-    isSubnetIPv6(index) ? IPv6PrefixHelperText : IPv4PrefixHelperText;
+  const clusterNetworkHostPrefixPopoverText = (index: number) => (
+    <>
+      <p>
+        The subnet prefix length to assign to each individual node.{' '}
+        {isSubnetIPv6(index) ? IPv6PrefixPopoverText : IPv4PrefixPopoverText}
+      </p>
+      <p>
+        If you are required to provide access to nodes from an external network, configure load
+        balancers and routers to manage the traffic.
+      </p>
+    </>
+  );
 
   return (
     <Grid hasGutter className="pf-u-ml-lg">
@@ -76,7 +89,15 @@ const AdvancedNetworkFields = () => {
                   <StackItem className={'network-field-group pf-u-pb-md'}>
                     <OcmInputField
                       name={`clusterNetworks.${index}.hostPrefix`}
-                      label={`Cluster network host prefix${networkSuffix}`}
+                      label={
+                        <>
+                          <span>Cluster network host prefix{networkSuffix} </span>
+                          <PopoverIcon
+                            bodyContent={clusterNetworkHostPrefixPopoverText(index)}
+                            minWidth="30rem"
+                          />
+                        </>
+                      }
                       type={TextInputTypes.number}
                       min={clusterNetworkCidrPrefix(index)}
                       max={
@@ -84,7 +105,7 @@ const AdvancedNetworkFields = () => {
                           ? PREFIX_MAX_RESTRICTION.IPv6
                           : PREFIX_MAX_RESTRICTION.IPv4
                       }
-                      helperText={clusterNetworkHostPrefixHelperText(index)}
+                      helperText={ClusterPrefixHelperText}
                       isRequired
                     />
                   </StackItem>

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -38,7 +38,7 @@ import { captureException } from '../../../sentry';
 import { ClustersService } from '../../../services';
 import { setServerUpdateError, updateClusterBase } from '../../../reducers/clusters';
 import { isUnknownServerError, getApiErrorMessage, handleApiError } from '../../../api';
-import { useClusterSupportedPlatforms } from '../../../hooks';
+import { useClusterSupportedPlatforms, usePullSecret } from '../../../hooks';
 
 const NetworkConfigurationForm: React.FC<{
   cluster: Cluster;
@@ -127,11 +127,18 @@ const NetworkConfigurationForm: React.FC<{
 };
 
 const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
+  const pullSecret = usePullSecret();
   const {
     infraEnv,
     error: infraEnvError,
     isLoading,
-  } = useInfraEnv(cluster.id, CpuArchitecture.USE_DAY1_ARCHITECTURE);
+  } = useInfraEnv(
+    cluster.id,
+    cluster.cpuArchitecture ? (cluster.cpuArchitecture as CpuArchitecture) : CpuArchitecture.x86,
+    cluster.name,
+    pullSecret,
+    cluster.openshiftVersion,
+  );
   const defaultNetworkValues = useDefaultConfiguration([
     'clusterNetworksDualstack',
     'clusterNetworksIpv4',

package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx

@@ -159,19 +159,12 @@ export const StackTypeControlGroup = ({
       >
         <Split>
           <SplitItem>
-            <Tooltip
-              content={
-                'Dual-stack is only available when your hosts are using IPV4 together with IPV6.'
-              }
-              hidden={isDualStackSelectable}
-            >
-              <OcmRadioField
-                name={'stackType'}
-                value={IPV4_STACK}
-                isDisabled={!isDualStackSelectable}
-                label="IPv4&nbsp;"
-              />
-            </Tooltip>
+            <OcmRadioField
+              name={'stackType'}
+              value={IPV4_STACK}
+              isDisabled={!isDualStackSelectable}
+              label="IPv4&nbsp;"
+            />
           </SplitItem>
           <SplitItem>
             <PopoverIcon