@openshift-assisted/ui-lib 2.37.2 → 2.38.0

package/build/cjs/ocm/services/ClustersService.js

@@ -7,6 +7,8 @@ const HostsService_1 = tslib_1.__importDefault(require("./HostsService"));
 const InfraEnvsService_1 = tslib_1.__importDefault(require("./InfraEnvsService"));
 const constants_1 = require("../../common/config/constants");
 const axiosClient_1 = require("../../common/api/axiosClient");
+const config_1 = require("../config");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const ClustersService = {
     findHost(hosts = [], hostId) {
         return hosts.find((host) => host.id === hostId);
@@ -75,7 +77,13 @@ const ClustersService = {
     updateClusterTags(clusterTags, params) {
         const tags = (clusterTags === null || clusterTags === void 0 ? void 0 : clusterTags.split(',')) || [];
         if (tags.includes(constants_1.AI_UI_TAG)) {
-            delete params.tags;
+            if (params.tags && params.tags.includes(constants_1.AI_CISCO_INTERSIGHT_TAG)) {
+                tags === null || tags === void 0 ? void 0 : tags.push(constants_1.AI_CISCO_INTERSIGHT_TAG);
+                params.tags = tags === null || tags === void 0 ? void 0 : tags.join(',');
+            }
+            else {
+                delete params.tags;
+            }
         }
         else {
             tags === null || tags === void 0 ? void 0 : tags.push(constants_1.AI_UI_TAG);
@@ -120,6 +128,30 @@ const ClustersService = {
     updateCustomManifest(existingManifest, updatedManifest, clusterId) {
         return ClustersAPI_1.default.updateCustomManifest(clusterId, this.getUpdateManifestParams(existingManifest, updatedManifest));
     },
+    //TO-DO: Assisted-Migration. Provisional code. Needs to be removed when MTV integration be finished
+    createClusterManifestsForAssistedMigration(clusterId) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const manifests = [];
+            const parsedYaml1 = js_yaml_1.default.dump(config_1.yamlContentAssistedMigration1);
+            manifests.push({
+                folder: 'openshift',
+                filename: '0gitops.yaml',
+                manifestYaml: parsedYaml1,
+                created: true,
+            });
+            const parsedYaml2 = js_yaml_1.default.dump(config_1.yamlContentAssistedMigration2);
+            manifests.push({
+                folder: 'openshift',
+                filename: '1rolebindings.yaml',
+                manifestYaml: parsedYaml2,
+                created: true,
+            });
+            const promises = manifests.map((manifest) => {
+                return ClustersAPI_1.default.createCustomManifest(clusterId, this.transformFormViewManifest(manifest));
+            });
+            return Promise.all(promises);
+        });
+    },
 };
 exports.default = ClustersService;
 //# sourceMappingURL=ClustersService.js.map

package/build/cjs/ocm/services/ClustersService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/services/OperatorsService.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const common_1 = require("../../common");
 const utils_1 = require("../components/clusters/utils");
-const utils_2 = require("../../common/utils");
-const hasActiveOperators = (values) => {
-    return (0, utils_2.getKeys)(values).some((operatorParam) => values[operatorParam]);
-};
+const OperatorsAPI_1 = tslib_1.__importDefault(require("../../common/api/assisted-service/OperatorsAPI"));
 const OperatorsService = {
     getOLMOperators(values, cluster) {
         const enabledOlmOperatorsByName = (0, utils_1.getOlmOperatorCreateParamsByName)(cluster);
@@ -25,10 +23,14 @@ const OperatorsService = {
         setOperator(common_1.OPERATOR_NAME_MTV, values.useMigrationToolkitforVirtualization);
         setOperator(common_1.OPERATOR_NAME_OPENSHIFT_AI, values.useOpenShiftAI);
         setOperator(common_1.OPERATOR_NAME_OSC, values.useOsc);
-        // TODO: remove following once the LSO option is exposed to the user
-        if (!hasActiveOperators(values)) {
-            setOperator(common_1.OPERATOR_NAME_LSO, false);
-        }
+        setOperator(common_1.OPERATOR_NAME_NODE_FEATURE_DISCOVERY, values.useNodeFeatureDiscovery);
+        setOperator(common_1.OPERATOR_NAME_NMSTATE, values.useNmstate);
+        setOperator(common_1.OPERATOR_NAME_LSO, values.useLso);
+        setOperator(common_1.OPERATOR_NAME_SERVERLESS, values.useServerless);
+        setOperator(common_1.OPERATOR_NAME_AUTHORINO, values.useAuthorino);
+        setOperator(common_1.OPERATOR_NAME_PIPELINES, values.usePipelines);
+        setOperator(common_1.OPERATOR_NAME_SERVICEMESH, values.useServicemesh);
+        setOperator(common_1.OPERATOR_NAME_NVIDIA_GPU, values.useNvidiaGpu);
         return Object.values(enabledOlmOperatorsByName);
     },
     /**
@@ -52,6 +54,12 @@ const OperatorsService = {
         }
         return updates;
     },
+    getSupportedOperators() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { data: operators } = yield OperatorsAPI_1.default.list();
+            return operators;
+        });
+    },
 };
 exports.default = OperatorsService;
 //# sourceMappingURL=OperatorsService.js.map

package/build/cjs/ocm/services/OperatorsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OperatorsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/OperatorsService.tsx"],"names":[],"mappings":";;AAAA,yCAWsB;AACtB,wDAAgF;AAChF,8CAA6C;AAM7C,MAAM,kBAAkB,GAAG,CAAC,MAAuB,EAAE,EAAE;IACrD,OAAO,IAAA,eAAO,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,eAAe,CAAC,MAAuB,EAAE,OAAgB;QACvD,MAAM,yBAAyB,GAAG,IAAA,wCAAgC,EAAC,OAAO,CAAC,CAAC;QAE5E,8FAA8F;QAC9F,MAAM,WAAW,GAAG,CAAC,IAAkB,EAAE,OAAgB,EAAE,EAAE;YAC3D,IAAI,OAAO,EAAE;gBACX,yBAAyB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;aAC5C;iBAAM;gBACL,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC;aACxC;QACH,CAAC,CAAC;QAEF,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAClE,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,gCAAgC,CAAC,CAAC;QACxE,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAClE,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC7D,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAC5E,WAAW,CAAC,mCAA0B,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;QAC/D,WAAW,CAAC,0BAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,oEAAoE;QACpE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;YAC/B,WAAW,CAAC,0BAAiB,EAAE,KAAK,CAAC,CAAC;SACvC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,aAAa,CACX,WAAmC,EACnC,gBAA+C;QAE/C,MAAM,OAAO,GAA6B,EAAE,CAAC;QAE7C,8FAA8F;QAC9F,MAAM,eAAe,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,0BAAiB,CAAC,MAAK,SAAS,CAAC;QAC/F,MAAM,YAAY,GAChB,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,0BAAiB,CAAC,MAAK,SAAS,CAAC;QAC9E,IAAI,eAAe,IAAI,YAAY,EAAE;YACnC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC;SAC3C;QAED,0FAA0F;QAC1F,MAAM,eAAe,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,0BAAiB,CAAC,MAAK,SAAS,CAAC;QAC/F,MAAM,YAAY,GAChB,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,0BAAiB,CAAC,MAAK,SAAS,CAAC;QAC9E,IAAI,eAAe,IAAI,YAAY,EAAE;YACnC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC;SAC3C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC;AACF,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"OperatorsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/OperatorsService.tsx"],"names":[],"mappings":"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"}

package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx

@@ -14,8 +14,8 @@ import {
 import { ClusterDetailsValues } from '../../../common/components/clusterWizard/types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import CpuArchitectureDropdown from '../common/CpuArchitectureDropdown';
-import { SNOControlGroup } from '../../../common';
 import { getNetworkType } from '../helpers';
+import ControlPlaneNodesDropdown from '../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
   forceOpenshiftVersion?: string;
@@ -52,7 +52,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   cpuArchitectures,
 }) => {
   const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
-  const { name, baseDnsDomain, highAvailabilityMode } = values;
+  const { name, baseDnsDomain } = values;
 
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
@@ -110,11 +110,9 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           }}
         />
       )}
+      <ControlPlaneNodesDropdown isNutanix={isNutanix} isDisabled={isEditFlow} />
       {!isNutanix && (
-        <>
-          <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
-          <CpuArchitectureDropdown isDisabled={isEditFlow} cpuArchitectures={cpuArchitectures} />
-        </>
+        <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
       {!isEditFlow && <PullSecret />}

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/toAssisted.ts

@@ -170,6 +170,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/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/api/assisted-service/BundleAPI.ts

@@ -0,0 +1,18 @@
+import { client } from '../axiosClient';
+import { Bundle } from '@openshift-assisted/types/assisted-installer-service';
+
+const BundleAPI = {
+  makeBaseURI() {
+    return `/v2/operators/bundles`;
+  },
+
+  list() {
+    return client.get<Bundle[]>(`${BundleAPI.makeBaseURI()}`);
+  },
+
+  listOperatorsForBundle(bundleName: string) {
+    return client.get<string[]>(`${BundleAPI.makeBaseURI()}?bundle_name=${bundleName}`);
+  },
+};
+
+export default BundleAPI;

package/lib/common/api/assisted-service/OperatorsAPI.ts

@@ -0,0 +1,13 @@
+import { client } from '../axiosClient';
+
+const OperatorsAPI = {
+  makeBaseURI() {
+    return `/v2/supported-operators`;
+  },
+
+  list() {
+    return client.get<string[]>(`${OperatorsAPI.makeBaseURI()}`);
+  },
+};
+
+export default OperatorsAPI;

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/clusterConfiguration/DownloadIso.tsx

@@ -26,6 +26,7 @@ export type DownloadISOProps = {
   onClose: () => void;
   onReset?: () => void;
   docVersion?: string;
+  updateTagsForCiscoIntersight?: () => void;
 };
 
 const DownloadIso = ({
@@ -36,9 +37,16 @@ const DownloadIso = ({
   hasDHCP,
   isSNO = false,
   docVersion,
+  updateTagsForCiscoIntersight,
 }: DownloadISOProps) => {
   const wgetCommand = `wget -O ${fileName} '${downloadUrl || ''}'`;
   const { t } = useTranslation();
+
+  const openCiscoIntersightHostsLink = (downloadUrl: string) => {
+    updateTagsForCiscoIntersight ? updateTagsForCiscoIntersight() : '';
+    window.open(getCiscoIntersightLink(downloadUrl), '_blank', 'noopener');
+  };
+
   return (
     <>
       <ModalBoxBody>
@@ -66,7 +74,7 @@ const DownloadIso = ({
               icon={<ExternalLinkAltIcon />}
               iconPosition="right"
               isInline
-              onClick={() => window.open(getCiscoIntersightLink(downloadUrl), '_blank', 'noopener')}
+              onClick={() => openCiscoIntersightHostsLink(downloadUrl)}
             >
               {t('ai:Add hosts from Cisco Intersight')}
             </Button>

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

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

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

@@ -34,7 +34,7 @@ export type ClusterDetailsValues = {
   platform: PlatformType;
   customOpenshiftSelect: OpenshiftVersionOptionType | null;
   userManagedNetworking: boolean;
-  controlPlaneCount: string;
+  controlPlaneCount: number;
 };
 
 export type HostsValidationsProps<S extends string, V extends string[]> = {
@@ -69,7 +69,9 @@ export type ValidationActionLinkProps<S extends string> = {
   wizardStepNames: { [key in S]: string };
 };
 
-export type ClusterOperatorProps = Pick<Cluster, 'openshiftVersion'> & { clusterId: Cluster['id'] };
+export type ClusterOperatorProps = Pick<Cluster, 'openshiftVersion'> & {
+  clusterId: Cluster['id'];
+} & { monitoredOperators?: Cluster['monitoredOperators'] };
 
 export type ItemDropdown = {
   label: string;

package/lib/common/components/hosts/AITableMemo.tsx

@@ -94,7 +94,7 @@ export const AITableMemo = React.memo(
                     </Td>
                   ))}
 
-                  {row.actions && (
+                  {!!row.actions?.length && (
                     <Td isActionCell>
                       <ActionsColumn
                         items={row.actions}

package/lib/common/components/hosts/HostRowDetail.tsx

@@ -2,7 +2,12 @@ import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 import { TableVariant, Tbody, Thead, Table, Th, Tr, Td } from '@patternfly/react-table';
 import { DetailItem, DetailList, DetailListProps } from '../ui';
-import type { Disk, Host, Interface } from '@openshift-assisted/types/assisted-installer-service';
+import type {
+  Disk,
+  Host,
+  Interface,
+  Gpu,
+} from '@openshift-assisted/types/assisted-installer-service';
 import type { ValidationsInfo } from '../../types/hosts';
 import type { WithTestID } from '../../types/index';
 import { DASH } from '../constants';
@@ -107,6 +112,62 @@ const NicsTable: React.FC<NicsTableProps & WithTestID> = ({ interfaces, testId }
   );
 };
 
+type GpusTableProps = {
+  gpus: Gpu[];
+};
+
+const gpusColumns = (t: TFunction) => [
+  { title: t('ai:Vendor') },
+  { title: t('ai:Vendor ID') },
+  { title: t('ai:Model') },
+  { title: t('ai:Device ID') },
+  { title: t('ai:Address') },
+];
+
+const GpusTable: React.FC<GpusTableProps & WithTestID> = ({ gpus: gpus, testId }) => {
+  const { t } = useTranslation();
+  const rows = gpus
+    .sort((gpuA, gpuB) => gpuA.name?.localeCompare(gpuB.name || '') || 0)
+    .map((gpu) => ({
+      cells: [
+        { title: gpu.vendor, props: { 'data-testid': 'gpu-vendor' } },
+        { title: gpu.vendorId, props: { 'data-testid': 'gpu-vendor-id' } },
+        { title: gpu.name, props: { 'data-testid': 'gpu-name' } },
+        { title: gpu.deviceId, props: { 'data-testid': 'gpu-device-id' } },
+        { title: gpu.address, props: { 'data-testid': 'gpu-address' } },
+      ],
+      key: gpu.name,
+    })) as { cells: { title: string | React.ReactNode; props?: object }[]; key: string }[];
+
+  return (
+    <Table
+      data-testid={testId}
+      variant={TableVariant.compact}
+      aria-label={t("ai:Host's graphics processing units table")}
+      borders={false}
+    >
+      <Thead>
+        <Tr>
+          {gpusColumns(t).map((col, i) => (
+            <Th key={`col-${i}`}>{col.title}</Th>
+          ))}
+        </Tr>
+      </Thead>
+      <Tbody>
+        {rows.map((row, i) => (
+          <Tr key={`gpu-row:${row.key}`}>
+            {row.cells?.map((cell, j) => (
+              <Td key={`cell-${i}-${j}`} {...cell.props}>
+                {cell.title}
+              </Td>
+            ))}
+          </Tr>
+        ))}
+      </Tbody>
+    </Table>
+  );
+};
+
 export const HostDetail = ({
   host,
   canEditDisks,
@@ -124,6 +185,7 @@ export const HostDetail = ({
   );
   const rowInfo = getHostRowHardwareInfo(inventory);
   const nics = inventory.interfaces || [];
+  const gpus = inventory.gpus || [];
 
   let bmcAddress = inventory.bmcAddress;
   if (inventory.bmcV6address) {
@@ -218,6 +280,14 @@ export const HostDetail = ({
       <GridItem>
         <NicsTable interfaces={nics} testId={'nics-table'} />
       </GridItem>
+      {gpus.length > 0 && (
+        <div>
+          <SectionTitle testId={'gpus-section'} title={t('ai:GPU', { count: gpus.length })} />
+          <GridItem>
+            <GpusTable gpus={gpus} testId={'gpus-table'} />
+          </GridItem>
+        </div>
+      )}
     </Grid>
   );
 };