@openshift-assisted/ui-lib 2.14.0-cim → 2.14.2-cim

package/lib/cim/components/ClusterDeployment/types.ts

@@ -17,14 +17,13 @@ import { BMCFormProps } from '../Agent/types';
 import { AgentMachineK8sResource } from '../Hypershift/types';
 import { AddHostDropdownProps, ProvisioningConfigResult } from '../InfraEnv/types';
 import { AddHostModalProps, EditBMHModalProps, UploadActionModalProps } from '../modals/types';
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 
 export type EditAgentModalProps = {
-  agent: AgentK8sResource | undefined;
-  isOpen: boolean;
+  agent: AgentK8sResource;
   usedHostnames: string[] | undefined;
   onClose: () => void;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onSave: (agent: AgentK8sResource, hostname: string) => Promise<any>;
+  onSave: (host: Host, hostname: string) => Promise<unknown>;
 };
 
 export type AgentTableActions = {
@@ -85,7 +84,6 @@ export type ScaleUpFormValues = Omit<
 
 export type ClusterDeploymentDetailsStepProps = ClusterDeploymentDetailsProps & {
   onSaveDetails: (values: ClusterDeploymentDetailsValues) => Promise<unknown>;
-  onClose: () => void;
   isPreviewOpen: boolean;
   isNutanix: boolean;
 };
@@ -98,7 +96,6 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   agentClusterInstall: AgentClusterInstallK8sResource;
   agents: AgentK8sResource[];
   onSaveNetworking: (values: ClusterDeploymentNetworkingValues) => Promise<string | void>;
-  onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
   isNutanix: boolean;
@@ -115,7 +112,6 @@ export type ClusterDeploymentHostSelectionStepProps = Omit<
   'onHostSelect' | 'onAutoSelectChange'
 > & {
   onSaveHostsSelection: (values: ClusterDeploymentHostsSelectionValues) => Promise<string | void>;
-  onClose: () => void;
 };
 
 export type ClusterDeploymentHostsDiscoveryStepProps = Omit<
@@ -123,7 +119,6 @@ export type ClusterDeploymentHostsDiscoveryStepProps = Omit<
   'usedHostnames'
 > & {
   onSaveHostsDiscovery: () => Promise<void>;
-  onClose: () => void;
 };
 
 export type ClusterDeploymentWizardProps = {
@@ -146,6 +141,7 @@ export type ClusterDeploymentWizardProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
   agentClusterInstall: AgentClusterInstallK8sResource;
   agents: AgentK8sResource[];
+  bareMetalHosts: BareMetalHostK8sResource[];
   aiConfigMap?: ConfigMapK8sResource;
   infraEnv?: InfraEnvK8sResource;
   infraNMStates: NMStateK8sResource[];
@@ -155,7 +151,8 @@ export type ClusterDeploymentWizardProps = {
   setPreviewOpen: (open: boolean) => void;
   fetchManagedClusters: () => Promise<K8sResourceCommon[]>;
   fetchKlusterletAddonConfig: () => Promise<K8sResourceCommon[]>;
-  onSaveAgent: EditAgentModalProps['onSave'];
+  onChangeHostname: ClusterDeploymentHostsDiscoveryStepProps['onChangeHostname'];
+  onChangeBMHHostname: ClusterDeploymentHostsDiscoveryStepProps['onChangeBMHHostname'];
   onSaveBMH: EditBMHModalProps['onEdit'];
   onSaveISOParams?: AddHostModalProps['onSaveISOParams'];
   onSaveHostsDiscovery: ClusterDeploymentHostsDiscoveryStepProps['onSaveHostsDiscovery'];
@@ -225,7 +222,7 @@ export type ClusterDeploymentHostsDiscoveryProps = AddHostDropdownProps & {
   aiConfigMap?: ConfigMapK8sResource;
   infraNMStates: NMStateK8sResource[];
 
-  onSaveAgent: EditAgentModalProps['onSave'];
+  onChangeHostname: InfraEnvAgentTableProps['onChangeHostname'];
   onEditRole: ClusterDeploymentHostDiscoveryTableProps['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   onSaveBMH: EditBMHModalProps['onEdit'];

package/lib/cim/components/ClusterDeployment/use-networking-formik.ts

@@ -17,7 +17,7 @@ import {
   HostSubnets,
   hostPrefixValidationSchema,
   ipBlockValidationSchema,
-  vipValidationSchema,
+  vipArrayValidationSchema,
   sshPublicKeyValidationSchema,
   hostSubnetValidationSchema,
   httpProxyValidationSchema,
@@ -50,8 +50,8 @@ const getNetworkConfigurationValidationSchema = (
       clusterNetworkHostPrefix: hostPrefixValidationSchema(values.clusterNetworkCidr),
       clusterNetworkCidr: ipBlockValidationSchema(values.serviceNetworkCidr),
       serviceNetworkCidr: ipBlockValidationSchema(values.clusterNetworkCidr),
-      apiVip: vipValidationSchema(hostSubnets, values, initialValues.apiVip),
-      ingressVip: vipValidationSchema(hostSubnets, values, initialValues.ingressVip),
+      apiVips: vipArrayValidationSchema(hostSubnets, values, initialValues.apiVips),
+      ingressVips: vipArrayValidationSchema(hostSubnets, values, initialValues.ingressVips),
       sshPublicKey: sshPublicKeyValidationSchema,
       hostSubnet: hostSubnetValidationSchema,
       httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),

package/lib/cim/components/Hypershift/DetailsPage/HypershiftKubeconfigDownload.tsx

@@ -15,8 +15,10 @@ const HypershiftKubeconfigDownload = ({
   fetchSecret,
 }: HypershiftKubeconfigDownloadProps) => {
   const { t } = useTranslation();
+  const kubeconfigSecretName = hostedCluster.status?.customkubeconfig
+    ? hostedCluster.status.customkubeconfig?.name
+    : hostedCluster.status?.kubeconfig?.name;
   const handleKubeconfigDownload = async () => {
-    const kubeconfigSecretName = hostedCluster.status?.kubeconfig?.name;
     const kubeconfigSecretNamespace = hostedCluster.metadata?.namespace;
 
     if (kubeconfigSecretName && kubeconfigSecretNamespace) {
@@ -41,7 +43,7 @@ const HypershiftKubeconfigDownload = ({
       variant={ButtonVariant.secondary}
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClick={handleKubeconfigDownload}
-      isDisabled={!hostedCluster.status?.kubeconfig?.name}
+      isDisabled={!kubeconfigSecretName}
     >
       {t('ai:Download kubeconfig')}
     </Button>

package/lib/cim/components/Hypershift/types.ts

@@ -133,11 +133,11 @@ export type HostedClusterK8sResource = K8sResourceCommon & {
         endpointAccess: 'Public';
         kubeCloudControllerCreds: { name?: string };
         nodePoolManagementCreds: { name?: string };
-        region: 'us-west-2';
+        region: string;
         resourceTags: [
           {
-            key: 'kubernetes.io/cluster/feng-hs-scale-74zxh';
-            value: 'owned';
+            key: string;
+            value: string;
           },
         ];
       };
@@ -157,6 +157,9 @@ export type HostedClusterK8sResource = K8sResourceCommon & {
     kubeconfig?: {
       name: string;
     };
+    customkubeconfig?: {
+      name: string;
+    };
     kubeadminPassword?: {
       name: string;
     };

package/lib/cim/components/InfraEnv/InfraEnvAgentTable.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Button, Stack, StackItem } from '@patternfly/react-core';
 import { DropdownItem } from '@patternfly/react-core/deprecated';
-import noop from 'lodash-es/noop.js';
 
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -33,12 +32,12 @@ import {
 } from '../../../common';
 import { InfraEnvAgentTableProps } from '../ClusterDeployment/types';
 import { MassApproveAgentModal, MassDeleteAgentModal } from '../modals';
-import { MassChangeHostnameModalProps } from '../../../common/components/hosts/MassChangeHostnameModal';
 import MassApproveAction from '../modals/MassApproveAction';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import InfraTableToolbar from './InfraTableToolbar';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { agentStatus, bmhStatus } from '../helpers/agentStatus';
+import { onAgentChangeHostname } from '../helpers';
 
 type NoFilterMatchStateProps = {
   onClearFilters: VoidFunction;
@@ -205,19 +204,6 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
     <DeleteHostAction key="delete" onDeleteHost={() => setMassDeleteOpen(!isMassDeleteOpen)} />,
   ];
 
-  const onAgentChangeHostname: MassChangeHostnameModalProps['onChangeHostname'] = async (
-    host,
-    hostname,
-  ) => {
-    const agent = agents.find((a) => a.metadata?.uid === host.id);
-    if (agent) {
-      return onChangeHostname(agent, hostname);
-    } else {
-      const bmh = bareMetalHosts.find((bmh) => bmh.metadata?.uid === host.id);
-      return bmh ? onChangeBMHHostname(bmh, hostname) : noop;
-    }
-  };
-
   const paginationProps = usePagination(hosts.length);
 
   return (
@@ -272,7 +258,12 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
           isOpen={isMassChangeHostOpen}
           hosts={hosts}
           selectedHostIDs={selectedHostIDs}
-          onChangeHostname={onAgentChangeHostname}
+          onChangeHostname={onAgentChangeHostname(
+            agents,
+            bareMetalHosts,
+            onChangeHostname,
+            onChangeBMHHostname,
+          )}
           onClose={() => setMassChangeHostOpen(false)}
           canChangeHostname={canChangeHostname(agents, agentStatuses, bareMetalHosts, t)}
         />

package/lib/cim/components/InfraEnv/OpenshiftVersionDropdown.tsx

@@ -35,7 +35,7 @@ const OpenshiftVersionDropdown = ({ osImages }: { osImages: OsImage[] }) => {
       <Tooltip
         content={t(
           'ai:No OpenShift images available for selected CPU architecture {{cpuArchitecture}}.',
-          architectureData[cpuArchitecture as SupportedCpuArchitecture].label,
+          { cpuArchitecture: architectureData[cpuArchitecture as SupportedCpuArchitecture].label },
         )}
         hidden={!!filteredImages.length}
       >

package/lib/cim/components/common/constants.ts

@@ -16,8 +16,7 @@ export const INFRAENV_GENERATED_AI_FLOW = 'agentBareMetal-generated-infraenv-ai-
 export const CPU_ARCHITECTURE_ANNOTATION_KEY = 'agentBareMetal-cpuArchitecture';
 
 export const getInfraEnvDocs = (docVersion: string) =>
-  `https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/${docVersion}/html-single/clusters/index#enable-cim`;
-
+  `https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/${docVersion}/html-single/clusters/index#enable-cim-prerequisites`;
 export const BMH_HOSTNAME_ANNOTATION = 'bmac.agent-install.openshift.io/hostname';
 
 export const OCP_VERSION_MAJOR_MINOR = 'hive.openshift.io/version-major-minor';

package/lib/cim/components/helpers/agents.ts

@@ -1,7 +1,7 @@
 import { AgentStatus, getAgentStatusKey } from './status';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { AgentK8sResource, BareMetalHostK8sResource } from '../../types';
-import { INFRAENV_AGENTINSTALL_LABEL_KEY } from '../common/constants';
+import { AGENT_BMH_NAME_LABEL_KEY, INFRAENV_AGENTINSTALL_LABEL_KEY } from '../common/constants';
 
 const AGENT_FOR_SELECTION_STATUSES: AgentStatus[] = [
   'known',
@@ -33,3 +33,32 @@ export const getInfraEnvNameOfAgent = (resource?: AgentK8sResource | BareMetalHo
 
 export const getClusterNameOfAgent = (agent?: AgentK8sResource) =>
   agent?.spec?.clusterDeploymentName?.name;
+
+type OnAgentChangeHostname<A = AgentK8sResource, B = BareMetalHostK8sResource> = (
+  agents: A[],
+  bmhs: B[],
+  onChangeHostname: (agent: A, hostname: string) => Promise<unknown>,
+  onChangeBMHHostname: (bmh: B, hostname: string) => Promise<unknown>,
+) => (host: Host, hostname: string) => Promise<unknown>;
+
+export const onAgentChangeHostname: OnAgentChangeHostname<
+  AgentK8sResource,
+  BareMetalHostK8sResource
+> = (agents, bmhs, onChangeHostname, onChangeBMHHostname) => (host, hostname) => {
+  const agent = agents.find((a) => a.metadata?.uid === host.id);
+  let bmh: BareMetalHostK8sResource | undefined;
+  if (agent) {
+    const bmhName = agent.metadata?.labels?.[AGENT_BMH_NAME_LABEL_KEY];
+    if (!bmhName) {
+      return onChangeHostname(agent, hostname);
+    }
+    // If Agent is backed by BMH, we need to update hostname on BMH
+    bmh = bmhs.find(
+      (bmh) =>
+        bmh.metadata?.namespace === agent.metadata?.namespace && bmh.metadata?.name === bmhName,
+    );
+  } else {
+    bmh = bmhs.find((bmh) => bmh.metadata?.uid === host.id);
+  }
+  return bmh ? onChangeBMHHostname(bmh, hostname) : Promise.resolve(undefined);
+};

package/lib/cim/components/helpers/toAssisted.ts

@@ -135,14 +135,18 @@ export const getAICluster = ({
     name: clusterDeployment.spec?.clusterName,
     baseDnsDomain: clusterDeployment.spec?.baseDomain,
     openshiftVersion: installVersion,
-    apiVips: [
-      {
-        ip: agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP,
-      },
-    ],
-    ingressVips: [
-      { ip: agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.apiVIP },
-    ],
+    apiVips:
+      agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP
+        ? [
+            {
+              ip: agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP,
+            },
+          ]
+        : [],
+    ingressVips:
+      agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.ingressVIP
+        ? [{ ip: agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.ingressVIP }]
+        : [],
     highAvailabilityMode:
       agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents === 1 ? 'None' : 'Full',
     status,
@@ -170,6 +174,7 @@ export const getAICluster = ({
     validationsInfo: JSON.stringify(agentClusterInstall?.status?.validationsInfo || {}),
     cpuArchitecture: getClusterDeploymentCpuArchitecture(clusterDeployment, infraEnv),
     networkType: agentClusterInstall?.spec?.networking.networkType,
+    controlPlaneCount: agentClusterInstall?.spec?.provisionRequirements.controlPlaneAgents || 3,
   };
   /*
   aiCluster.agentSelectorMasterLabels =

package/lib/cim/components/modals/AddHostModal.tsx

@@ -30,9 +30,8 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
   const hasDHCP = infraEnv.metadata?.labels?.networkType !== 'static';
   const sshPublicKey = infraEnv.spec?.sshAuthorizedKey || agentClusterInstall?.spec?.sshPublicKey;
   const { httpProxy, httpsProxy, noProxy } = infraEnv.spec?.proxy || {};
-
-  const isoDialog = agentClusterInstall ? 'config' : 'download';
-  const [dialogType, setDialogType] = React.useState<AddHostModalStepType>(isoDialog);
+  const imageType = infraEnv.spec?.imageType || 'minimal-iso';
+  const [dialogType, setDialogType] = React.useState<AddHostModalStepType>('config');
   const { t } = useTranslation();
   const handleIsoConfigSubmit = async (
     values: DiscoveryImageFormValues,
@@ -66,8 +65,8 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
           <DiscoveryImageConfigForm
             onCancel={onClose}
             handleSubmit={handleIsoConfigSubmit}
-            hideDiscoveryImageType={true} // So far configured by env variable on backend
-            imageType="full-iso" // So far the only option for CIM
+            hideDiscoveryImageType={isIPXE}
+            imageType={imageType}
             sshPublicKey={sshPublicKey}
             httpProxy={httpProxy}
             httpsProxy={httpsProxy}

package/lib/cim/components/modals/EditAgentModal.tsx

@@ -7,11 +7,12 @@ const EditAgentModal: React.FC<EditAgentModalProps> = ({ agent, onSave, ...rest
   const [host] = agent ? getAIHosts([agent]) : [];
   return (
     <EditHostModal
+      isOpen
       host={host}
       inventory={agent?.status?.inventory}
       {...rest}
       onSave={async ({ hostname }) => {
-        agent && (await onSave(agent, hostname));
+        agent && (await onSave(host, hostname));
         rest.onClose();
       }}
     />

package/lib/cim/components/modals/ScaleUpModal.tsx

@@ -25,6 +25,8 @@ import EditAgentModal from './EditAgentModal';
 import { getAgentsHostsNames } from '../ClusterDeployment/helpers';
 import { getErrorMessage } from '../../../common/utils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { onAgentChangeHostname } from '../helpers';
+import { BareMetalHostK8sResource } from '../../types';
 
 const getAgentsToAdd = (
   selectedHostIds: ScaleUpFormValues['selectedHostIds'] | ScaleUpFormValues['autoSelectedHostIds'],
@@ -56,7 +58,9 @@ type ScaleUpModalProps = {
   addHostsToCluster: (agentsToAdd: AgentK8sResource[]) => Promise<void>;
   clusterDeployment: ClusterDeploymentK8sResource;
   agents: AgentK8sResource[];
+  bareMetalHosts: BareMetalHostK8sResource[];
   onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
+  onChangeBMHHostname: (bmh: BareMetalHostK8sResource, hostname: string) => Promise<unknown>;
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   isNutanix: boolean;
 };
@@ -67,7 +71,9 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
   addHostsToCluster,
   clusterDeployment,
   agents,
+  bareMetalHosts,
   onChangeHostname,
+  onChangeBMHHostname,
   onSetInstallationDiskId,
   isNutanix,
 }) => {
@@ -176,9 +182,13 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
       {editAgent && (
         <EditAgentModal
           agent={editAgent}
-          isOpen
           onClose={() => setEditAgent(undefined)}
-          onSave={onChangeHostname}
+          onSave={onAgentChangeHostname(
+            agents,
+            bareMetalHosts,
+            onChangeHostname,
+            onChangeBMHHostname,
+          )}
           usedHostnames={getAgentsHostsNames(clusterAgents)}
         />
       )}

package/lib/cim/types/k8s/infra-env-k8s-resource.ts

@@ -25,6 +25,7 @@ export type InfraEnvK8sResource = K8sResourceCommon & {
     additionalNTPSources?: string[];
     cpuArchitecture?: 'x86_64' | 'arm64' | 's390x';
     osImageVersion?: string;
+    imageType?: 'full-iso' | 'minimal-iso';
   };
   status?: {
     agentLabelSelector?: Selector;

package/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx

@@ -0,0 +1,93 @@
+import * as React from 'react';
+import { Dropdown, DropdownItem, DropdownToggle } from '@patternfly/react-core/deprecated';
+import { FormGroup, Tooltip } from '@patternfly/react-core';
+import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { getFieldId, StaticField } from '../..';
+import { useField } from 'formik';
+import toNumber from 'lodash-es/toNumber';
+
+interface ControlPlaneNodesOption {
+  value: number;
+  label: string;
+}
+
+const isDropdownItemEnabled = (controlPlaneNodeCount: number, isNutanix?: boolean): boolean => {
+  return (controlPlaneNodeCount === 1 && !isNutanix) || controlPlaneNodeCount !== 1;
+};
+
+const ControlPlaneNodesDropdown = ({
+  isDisabled = false,
+  isNutanix,
+}: {
+  isDisabled?: boolean;
+  isNutanix?: boolean;
+}) => {
+  const { t } = useTranslation();
+  const [{ name, value: selectedValue }, , { setValue }] = useField<number | 3>(
+    'controlPlaneCount',
+  );
+
+  const options: ControlPlaneNodesOption[] = [
+    { value: 1, label: t('ai:1 (Single Node OpenShift - not highly available cluster)') },
+    { value: 3, label: t('ai:3 (highly available cluster)') },
+    { value: 4, label: t('ai:4 (highly available cluster+)') },
+    { value: 5, label: t('ai:5 (highly available cluster++)') },
+  ];
+
+  const dropdownItems = options.map(({ value, label }) => {
+    const isItemEnabled = isDropdownItemEnabled(value, isNutanix);
+    const disabledReason = t('ai:This option is not available for Nutanix platform');
+    return (
+      <DropdownItem
+        key={value}
+        id={value.toString()}
+        isAriaDisabled={!isItemEnabled}
+        selected={selectedValue === value}
+        value={value}
+      >
+        <Tooltip hidden={isItemEnabled} content={disabledReason} position="top">
+          <div>{label}</div>
+        </Tooltip>
+      </DropdownItem>
+    );
+  });
+
+  const [controlPlanelOpen, setControlPlanelOpen] = React.useState(false);
+  const fieldId = getFieldId(name, 'input');
+
+  const onControlPlaneSelect = (e?: React.SyntheticEvent<HTMLDivElement>) => {
+    const val = e?.currentTarget.id as string;
+    setValue(toNumber(val));
+    setControlPlanelOpen(false);
+  };
+
+  return !isDisabled ? (
+    <FormGroup isInline fieldId={fieldId} label={t('ai:Number of control plane nodes')} isRequired>
+      <Dropdown
+        toggle={
+          <DropdownToggle
+            onToggle={() => setControlPlanelOpen(!controlPlanelOpen)}
+            className="pf-u-w-100"
+          >
+            {selectedValue ? selectedValue : '3'}
+          </DropdownToggle>
+        }
+        name="controlPlaneCount"
+        isOpen={controlPlanelOpen}
+        onSelect={onControlPlaneSelect}
+        dropdownItems={dropdownItems}
+        className="pf-u-w-100"
+      />
+    </FormGroup>
+  ) : (
+    <StaticField
+      name={'controlPlaneCount'}
+      label={t('ai:Number of control plane nodes')}
+      isRequired
+    >
+      {selectedValue}
+    </StaticField>
+  );
+};
+
+export default ControlPlaneNodesDropdown;

package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx

@@ -116,17 +116,6 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
           <>
             <ModalBoxBody>
               <Stack hasGutter>
-                <StackItem>
-                  <Alert
-                    variant={AlertVariant.info}
-                    isInline
-                    title={
-                      isIPXE
-                        ? t('ai:To add hosts to the cluster, generate iPXE script.')
-                        : t('ai:To add hosts to the cluster, generate a Discovery ISO.')
-                    }
-                  />
-                </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
                     <StaticIPInfo docVersion={docVersion} />
@@ -134,8 +123,17 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 )}
                 <StackItem>
                   <Form>
-                    <AlertFormikError status={status as StatusErrorType} />
                     {!hideDiscoveryImageType && <DiscoveryImageTypeControlGroup />}
+                    <AlertFormikError status={status as StatusErrorType} />
+                    <Alert
+                      variant={AlertVariant.info}
+                      isInline
+                      title={
+                        isIPXE
+                          ? t('ai:To add hosts to the cluster, generate iPXE script.')
+                          : t('ai:To add hosts to the cluster, generate a Discovery ISO.')
+                      }
+                    />
                     <UploadSSH />
                     <ProxyFields />
                   </Form>

package/lib/common/components/clusterConfiguration/DiscoveryImageTypeControlGroup.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Stack, StackItem } from '@patternfly/react-core';
+import { Flex, FlexItem } from '@patternfly/react-core';
 import { PopoverIcon, RadioField } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
@@ -20,38 +20,38 @@ const DiscoveryImageTypeControlGroupLabel = ({
 const DiscoveryImageTypeControlGroup = () => {
   const { t } = useTranslation();
   return (
-    <Stack hasGutter>
-      <StackItem>
+    <Flex>
+      <FlexItem spacer={{ default: 'spacer3xl' }}>
         <RadioField
           name={GROUP_NAME}
           id={'minimal-iso'}
           value={'minimal-iso'}
           label={
             <DiscoveryImageTypeControlGroupLabel
-              text={t('ai:Minimal image file: Provision with virtual media')}
+              text={t('ai:Minimal image file')}
               popoverContent={t(
                 "ai:Recommended option. The generated discovery ISO will be smaller, but will need to download additional data during boot. This option is useful if ISO storage capacity is limited or if it's being served over a constrained network.",
               )}
             />
           }
         />
-      </StackItem>
-      <StackItem>
+      </FlexItem>
+      <FlexItem>
         <RadioField
           name={GROUP_NAME}
           id={'full-iso'}
           value={'full-iso'}
           label={
             <DiscoveryImageTypeControlGroupLabel
-              text={t('ai:Full image file: Provision with physical media')}
+              text={t('ai:Full image file')}
               popoverContent={t(
                 'ai:The generated discovery ISO will contain everything needed to boot.',
               )}
             />
           }
         />
-      </StackItem>
-    </Stack>
+      </FlexItem>
+    </Flex>
   );
 };
 

package/lib/common/components/clusterWizard/clusterDetailsValidation.ts

@@ -81,6 +81,7 @@ export const getClusterDetailsInitialValues = ({
     platform: cluster?.platform?.type || 'none',
     customOpenshiftSelect: null,
     userManagedNetworking: cluster?.userManagedNetworking || false,
+    controlPlaneCount: cluster?.controlPlaneCount || 3,
   };
 };