@openshift-assisted/ui-lib 2.48.5 → 2.49.0

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentReviewStep.tsx → review/ClusterDeploymentReviewStep.tsx}

@@ -8,14 +8,14 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import * as React from 'react';
-import { canNextFromReviewStep } from './wizardTransition';
+import { canNextFromReviewStep } from '../wizardTransition';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   ClusterImageSetK8sResource,
   InfraEnvK8sResource,
-} from '../../types';
+} from '../../../types';
 import {
   ClusterWizardStepHeader,
   DetailList,
@@ -24,18 +24,25 @@ import {
   ClusterValidations,
   HostsValidations,
   useAlerts,
-} from '../../../common';
-import { getSelectedVersion, getAICluster, getClusterDeploymentCpuArchitecture } from '../helpers';
-import { isAgentOfCluster } from './helpers';
-import { wizardStepNames } from './constants';
+  getPlatforms,
+} from '../../../../common';
+import {
+  getSelectedVersion,
+  getAICluster,
+  getClusterDeploymentCpuArchitecture,
+} from '../../helpers';
+import { isAgentOfCluster } from '../helpers';
+import { wizardStepNames } from '../constants';
 import {
   wizardStepsValidationsMap,
   ClusterWizardStepsType,
   allClusterWizardSoftValidationIds,
-} from './wizardTransition';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
-import { ValidationSection } from './components/ValidationSection';
+} from '../wizardTransition';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { ReviewConfigMapsTable } from './ReviewConfigMapsTable';
+import { ValidationSection } from '../components/ValidationSection';
+import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 
 type ClusterDeploymentReviewStepProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -47,7 +54,7 @@ type ClusterDeploymentReviewStepProps = {
   infraEnv?: InfraEnvK8sResource;
 };
 
-const ClusterDeploymentReviewStep = ({
+export const ClusterDeploymentReviewStep = ({
   agentClusterInstall,
   agents,
   onFinish,
@@ -77,7 +84,7 @@ const ClusterDeploymentReviewStep = ({
       await onFinish();
     } catch (err) {
       const error = err as Error;
-      addAlert({ title: error.message || t('ai:An error occured while starting installation.') });
+      addAlert({ title: error.message || t('ai:An error occurred while starting installation.') });
     } finally {
       setSubmitting(false);
     }
@@ -97,6 +104,10 @@ const ClusterDeploymentReviewStep = ({
   useWizardFooter(footer);
 
   const openShiftVersion = getSelectedVersion(clusterImages, agentClusterInstall);
+  const platform =
+    getPlatforms(t)[
+      (agentClusterInstall?.spec?.platformType?.toLowerCase() || 'baremetal') as PlatformType
+    ];
 
   const cluster = React.useMemo(
     () => getAICluster({ clusterDeployment, agentClusterInstall, agents: clusterAgents }),
@@ -127,6 +138,11 @@ const ClusterDeploymentReviewStep = ({
             value={cpuArchitecture}
             testId="cpu-architecture"
           />
+          <DetailItem
+            title={t('ai:External partner platform')}
+            value={platform}
+            testId="platform-type"
+          />
           <DetailItem
             title={t('ai:API IP')}
             value={agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP}
@@ -143,6 +159,13 @@ const ClusterDeploymentReviewStep = ({
             value={<ReviewHostsInventory hosts={cluster.hosts} />}
           />
 
+          {!!agentClusterInstall.spec?.manifestsConfigMapRefs?.length ? (
+            <DetailItem
+              title={t('ai:Custom manifests')}
+              value={<ReviewConfigMapsTable agentClusterInstall={agentClusterInstall} />}
+            />
+          ) : undefined}
+
           <DetailItem
             title={t('ai:Cluster validations')}
             value={
@@ -173,7 +196,7 @@ const ClusterDeploymentReviewStep = ({
       {syncError && (
         <GridItem>
           <ValidationSection currentStepId={'review'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -182,5 +205,3 @@ const ClusterDeploymentReviewStep = ({
     </Grid>
   );
 };
-
-export default ClusterDeploymentReviewStep;

package/lib/cim/components/ClusterDeployment/review/ReviewConfigMapsTable.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { useConfigMaps } from '../../../hooks';
+import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
+import { genericTableRowKey, LoadingState } from '../../../../common';
+import { AgentClusterInstallK8sResource } from '../../../types';
+
+export const ReviewConfigMapsTable = ({
+  agentClusterInstall,
+}: {
+  agentClusterInstall: AgentClusterInstallK8sResource;
+}) => {
+  const [configMaps, loaded] = useConfigMaps({
+    namespace: agentClusterInstall.metadata?.namespace,
+    isList: true,
+  });
+
+  const customManifests = React.useMemo(() => {
+    const maps = configMaps.filter((configMap) =>
+      agentClusterInstall.spec?.manifestsConfigMapRefs
+        ?.flatMap((ref) => ref.name)
+        .includes(configMap.metadata?.name || ''),
+    );
+
+    return maps
+      .map((map, index) => [
+        {
+          rowId: `config-map-${index}`,
+          cells: [{ title: map.metadata?.name as string, isExpanded: true, level: 1, posInset: 1 }],
+        },
+        ...Object.keys(map.data || {}).map((key) => ({
+          rowId: `config-map-${index}-${key}`,
+          cells: [
+            {
+              title: (
+                <>
+                  <span style={{ width: '1rem', display: 'inline-block' }} />
+                  {key}
+                </>
+              ),
+              posInset: 2,
+              level: 2,
+            },
+          ],
+        })),
+      ])
+      .flat();
+  }, [agentClusterInstall.spec?.manifestsConfigMapRefs, configMaps]);
+
+  return loaded ? (
+    <Table
+      variant={TableVariant.compact}
+      borders={false}
+      data-testid="review-custom-manifests-table"
+    >
+      <Tbody>
+        {customManifests.map((row, i) => (
+          <Tr key={genericTableRowKey(row.rowId)}>
+            {row.cells.map(({ title, ...props }, j) => (
+              <Td key={`cell-${i}-${j}`} {...props}>
+                {title}
+              </Td>
+            ))}
+          </Tr>
+        ))}
+      </Tbody>
+    </Table>
+  ) : (
+    <LoadingState />
+  );
+};

package/lib/cim/components/ClusterDeployment/review/index.tsx

@@ -0,0 +1 @@
+export * from './ClusterDeploymentReviewStep';

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

@@ -44,6 +44,7 @@ export type ClusterDeploymentWizardStepsType =
   | 'hosts-selection'
   | 'hosts-discovery'
   | 'networking'
+  | 'custom-manifests'
   | 'review';
 
 export type ClusterDeploymentDetailsProps = {
@@ -177,6 +178,7 @@ export type ClusterDeploymentHostsSelectionProps = {
   onAutoSelectChange: VoidFunction;
   onHostSelect: VoidFunction;
   isNutanix: boolean;
+  hostsBinding?: boolean;
 };
 
 export type InfraEnvAgentTableProps = Pick<

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

@@ -11,17 +11,17 @@ import {
   InfraEnvK8sResource,
 } from '../../types';
 import { getAICluster } from '../helpers';
-import { defaultNetworkSettings } from './ClusterDeploymentNetworkingForm';
 import { useDeepCompareMemoize } from '../../../common/hooks';
 import {
   HostSubnets,
   hostPrefixValidationSchema,
   ipBlockValidationSchema,
   vipArrayValidationSchema,
-  sshPublicKeyValidationSchema,
+  sshPublicKeyListValidationSchema,
   hostSubnetValidationSchema,
   httpProxyValidationSchema,
   noProxyValidationSchema,
+  CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4,
 } from '../../../common';
 import { ClusterDeploymentNetworkingValues } from './types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -52,7 +52,7 @@ const getNetworkConfigurationValidationSchema = (
       serviceNetworkCidr: ipBlockValidationSchema(values.clusterNetworkCidr),
       apiVips: vipArrayValidationSchema(hostSubnets, values, initialValues.apiVips),
       ingressVips: vipArrayValidationSchema(hostSubnets, values, initialValues.ingressVips),
-      sshPublicKey: sshPublicKeyValidationSchema,
+      sshPublicKey: sshPublicKeyListValidationSchema,
       hostSubnet: hostSubnetValidationSchema,
       httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),
       httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy' }), // share the schema, httpS is currently not supported
@@ -79,7 +79,7 @@ export const useNetworkingFormik = ({
         agents,
       });
       return {
-        ...getNetworkInitialValues(cluster, defaultNetworkSettings),
+        ...getNetworkInitialValues(cluster, CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4),
         enableProxy: false,
         editProxy: false,
       };

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

@@ -15,6 +15,7 @@ export type ClusterWizardStepsType =
   | 'hosts-selection'
   | 'hosts-discovery'
   | 'networking'
+  | 'custom-manifests'
   | 'review';
 
 const clusterDetailsStepValidationsMap: WizardStepValidationMap = {
@@ -98,6 +99,7 @@ export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardSt
   'hosts-discovery': hostDiscoveryStepValidationsMap,
   'hosts-selection': hostDiscoveryStepValidationsMap,
   networking: networkingStepValidationsMap,
+  'custom-manifests': networkingStepValidationsMap,
   review: reviewStepValidationsMap,
 };
 

package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/DetailsForm.tsx

@@ -8,7 +8,7 @@ import {
   PullSecret,
 } from '../../../../../common';
 import { useTranslation } from '../../../../../common/hooks/use-translation-wrapper';
-import { BaseDnsHelperText } from '../../../ClusterDeployment/ClusterDetailsFormFields';
+import { BaseDnsHelperText } from '../../../ClusterDeployment/clusterDetails/ClusterDetailsFormFields';
 import { useTemptiflySync } from '../../hooks/useTemptiflySync';
 import { DetailsFormProps, DetailsFormValues } from './types';
 
@@ -37,20 +37,15 @@ const DetailsForm: React.FC<DetailsFormProps> = ({
     [ocpVersions],
   );
 
-  const additionalSelectOptions = React.useMemo(() => {
+  const additionalSelectOption = React.useMemo(() => {
     if (
       values.customOpenshiftSelect &&
-      !selectOptions.some((option) => option.value === values.customOpenshiftSelect?.value)
+      !selectOptions.some((option) => option.value === values.customOpenshiftSelect)
     ) {
-      return [
-        {
-          value: values.customOpenshiftSelect.value,
-          label: values.customOpenshiftSelect.label,
-        },
-      ];
+      return allVersions.find((version) => version.value === values.customOpenshiftSelect);
     }
-    return [];
-  }, [selectOptions, values.customOpenshiftSelect]);
+    return undefined;
+  }, [allVersions, selectOptions, values.customOpenshiftSelect]);
 
   return (
     <Form>
@@ -75,7 +70,7 @@ const DetailsForm: React.FC<DetailsFormProps> = ({
         versions={ocpVersions}
         showReleasesLink={false}
         showOpenshiftVersionModal={() => setOpenshiftVersionModalOpen(true)}
-        customItems={additionalSelectOptions}
+        customItem={additionalSelectOption}
       />
       {openshiftVersionModalOpen && (
         <OpenShiftVersionModal

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

@@ -8,7 +8,7 @@ export type DetailsFormValues = {
   openshiftVersion: string;
   pullSecret: string;
   baseDnsDomain: string;
-  customOpenshiftSelect: OpenshiftVersionOptionType | null;
+  customOpenshiftSelect: string | null;
 };
 
 type UseDetailsFormikArgs = {

package/lib/cim/components/Hypershift/modals/ManageHostsModal.tsx

@@ -62,7 +62,7 @@ const getPatches = (values: NodePoolFormValues, nodePool: NodePoolK8sResource) =
       );
     }
   } else {
-    if (!!nodePool.spec.replicas) {
+    if (nodePool.spec.replicas !== undefined) {
       patches.push({
         op: 'replace',
         value: values.count,
@@ -123,7 +123,7 @@ const ManageHostsModal = ({
           agentLabels: labelsToFormikValue(
             nodePool.spec.platform?.agent?.agentLabelSelector?.matchLabels || {},
           ),
-          count: nodePool.spec.replicas || 1,
+          count: nodePool.spec.replicas || 0,
           useAutoscaling: !!nodePool.spec.autoScaling,
           autoscaling: {
             minReplicas: nodePool.spec.autoScaling?.min || 1,

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

@@ -22,7 +22,9 @@ import {
   cpuCoresColumn,
   discoveredAtColumn,
   disksColumn,
+  gpusColumn,
   memoryColumn,
+  labelsColumn,
 } from '../../../common/components/hosts/tableUtils';
 import {
   DiscoveryTroubleshootingModal,
@@ -122,6 +124,9 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
     setHostnameFilter,
     setStatusFilter,
     statusFilter,
+    labelFilter,
+    setLabelFilter,
+    hostLabels,
     filteredHosts: hosts,
     sorted,
   } = useAgentsFilter({
@@ -157,8 +162,10 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
         clusterColumn(agents, agentMachines, getClusterDeploymentLink, t),
         discoveredAtColumn(t),
         cpuCoresColumn(t),
+        gpusColumn(t),
         memoryColumn(t),
         disksColumn(t),
+        labelsColumn(t),
       ].filter(Boolean),
     [
       t,
@@ -219,6 +226,9 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
             hostnameFilter={hostnameFilter}
             statusFilter={statusFilter}
             setStatusFilter={setStatusFilter}
+            hostLabels={hostLabels}
+            labelFilter={labelFilter}
+            setLabelFilter={setLabelFilter}
             selectedHostIDs={selectedHostIDs}
             setHostnameFilter={setHostnameFilter}
             {...paginationProps}
@@ -241,6 +251,7 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
                 onClearFilters={() => {
                   setHostnameFilter(undefined);
                   setStatusFilter([]);
+                  setLabelFilter([]);
                 }}
               />
             ) : (

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

@@ -66,11 +66,14 @@ type InfraTableToolbarProps = ReturnType<typeof usePagination> & {
   setSelectedHostIDs: (items: string[]) => void;
   massActions: React.ReactNode[];
   hosts: Host[];
+  hostLabels: { [key in string]: number };
   statusFilter: string[];
+  labelFilter: string[];
   statusCount: StatusCount;
   hostnameFilter: string | undefined;
   setHostnameFilter: (hostname: string | undefined) => void;
   setStatusFilter: (status: string[]) => void;
+  setLabelFilter: (label: string[]) => void;
   selectedHostIDs: string[];
 };
 
@@ -78,17 +81,22 @@ const InfraTableToolbar: React.FC<InfraTableToolbarProps> = ({
   setSelectedHostIDs,
   massActions,
   hosts,
+  hostLabels,
   statusFilter,
+  labelFilter,
   statusCount,
   hostnameFilter,
   setHostnameFilter,
   setStatusFilter,
+  setLabelFilter,
   selectedHostIDs,
   ...paginationProps
 }) => {
   const { t } = useTranslation();
   const agentStatuses = agentStatus(t);
   const [statusFilterOpen, setStatusFilterOpen] = React.useState(false);
+  const [labelFilterOpen, setLabelFilterOpen] = React.useState(false);
+
   const itemIDs = React.useMemo(() => hosts.map((h) => h.id), [hosts]);
   const filterStatuses = React.useMemo(() => getStatusesForFilter(agentStatuses), [agentStatuses]);
   const categoryLabels = getCategoryLabels(t);
@@ -106,13 +114,29 @@ const InfraTableToolbar: React.FC<InfraTableToolbarProps> = ({
     }
   };
 
+  const onLabelFilterToggle = () => setLabelFilterOpen(!labelFilterOpen);
+  const onLabelFilterSelect = (
+    e?: React.MouseEvent<Element, MouseEvent>,
+    value?: string | number,
+  ) => {
+    if (!labelFilter?.includes(value as string)) {
+      const newItems = (labelFilter ? [...labelFilter, value] : [value]) as string[];
+      setLabelFilter(newItems);
+    } else {
+      setLabelFilter(labelFilter?.filter((f) => f !== value));
+    }
+  };
+
   return (
     <TableToolbar
       selectedIDs={selectedHostIDs || []}
       itemIDs={itemIDs}
       setSelectedIDs={setSelectedHostIDs}
       actions={massActions}
-      clearAllFilters={() => setStatusFilter([])}
+      clearAllFilters={() => {
+        setStatusFilter([]);
+        setLabelFilter([]);
+      }}
       {...paginationProps}
     >
       <ToolbarItem>
@@ -123,6 +147,7 @@ const InfraTableToolbar: React.FC<InfraTableToolbarProps> = ({
           onClear={() => setHostnameFilter(undefined)}
         />
       </ToolbarItem>
+
       <ToolbarItem>
         <ToolbarFilter
           labels={statusFilter}
@@ -175,6 +200,57 @@ const InfraTableToolbar: React.FC<InfraTableToolbarProps> = ({
           </Dropdown>
         </ToolbarFilter>
       </ToolbarItem>
+
+      <ToolbarItem>
+        <ToolbarFilter
+          labels={labelFilter}
+          deleteLabel={(_, label) => setLabelFilter(labelFilter.filter((f) => f !== label))}
+          deleteLabelGroup={() => setLabelFilter([])}
+          categoryName={'Labels'}
+        >
+          <Dropdown
+            isOpen={labelFilterOpen}
+            onSelect={onLabelFilterSelect}
+            onOpenChange={onLabelFilterToggle}
+            shouldFocusToggleOnSelect
+            toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
+              <MenuToggle
+                ref={toggleRef}
+                isFullWidth
+                onClick={onLabelFilterToggle}
+                isExpanded={labelFilterOpen}
+                icon={<FilterIcon />}
+              >
+                {t('ai:Labels')}
+              </MenuToggle>
+            )}
+          >
+            <DropdownGroup label={t('ai:Labels')}>
+              {Object.keys(hostLabels).length > 0 ? (
+                Object.entries(hostLabels).map(([label, count]) => (
+                  <DropdownItem
+                    hasCheckbox
+                    key={`host-label-${label}`}
+                    value={label}
+                    isSelected={labelFilter?.includes(label)}
+                  >
+                    <Split hasGutter>
+                      <SplitItem>{label}</SplitItem>
+                      <SplitItem>
+                        <Badge isRead>{count || 0}</Badge>
+                      </SplitItem>
+                    </Split>
+                  </DropdownItem>
+                ))
+              ) : (
+                <DropdownItem key="no-labels" isDisabled>
+                  {t('ai:No labels available')}
+                </DropdownItem>
+              )}
+            </DropdownGroup>
+          </Dropdown>
+        </ToolbarFilter>
+      </ToolbarItem>
     </TableToolbar>
   );
 };

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

@@ -4,6 +4,10 @@ import { getClusterNameOfAgent } from './agents';
 export const getIsSNOCluster = (agentClusterInstall?: AgentClusterInstallK8sResource) =>
   agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents === 1;
 
+export const getIsTNACluster = (agentClusterInstall?: AgentClusterInstallK8sResource) =>
+  agentClusterInstall?.spec?.provisionRequirements.arbiterAgents === 1 &&
+  agentClusterInstall.spec.provisionRequirements.controlPlaneAgents === 2;
+
 export const getAgentClusterInstallOfAgent = (
   agentClusterInstalls: AgentClusterInstallK8sResource[],
   agent?: AgentK8sResource,

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

@@ -18,9 +18,13 @@ const AGENT_FOR_SELECTION_STATUSES: AgentStatus[] = [
 export const hostToAgent = (agents: AgentK8sResource[] = [], host: Host) =>
   agents.find((a) => a.metadata?.uid === host.id) as AgentK8sResource;
 
-export const getAgentsForSelection = (agents: AgentK8sResource[]) =>
+export const getAgentsForSelection = (agents: AgentK8sResource[], isSubmitting?: boolean) =>
   agents.filter((agent) => {
     const key = getAgentStatusKey(agent);
+    if (isSubmitting) {
+      return [...AGENT_FOR_SELECTION_STATUSES, 'specSyncErr'].includes(key as AgentStatus);
+    }
+
     return AGENT_FOR_SELECTION_STATUSES.includes(key as AgentStatus);
   });
 

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

@@ -1,6 +1,11 @@
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { AgentK8sResource } from '../../types/k8s/agent';
-import { Cluster, Host, Inventory } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  Cluster,
+  Host,
+  Inventory,
+  PlatformType,
+} from '@openshift-assisted/types/assisted-installer-service';
 import { ClusterDeploymentK8sResource } from '../../types/k8s/cluster-deployment';
 import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
 import { getAgentStatusKey, getClusterStatus } from './status';
@@ -70,6 +75,7 @@ export const getAIHosts = (
       infraEnvId: `${agent.metadata?.namespace || ''}/${
         agent.metadata?.labels?.['infraenvs.agent-install.openshift.io'] || ''
       }`,
+      nodeLabels: JSON.stringify(agent.metadata?.labels || {}),
     };
   });
 
@@ -112,6 +118,18 @@ export const getAIHosts = (
   return [...hosts, ...restBmhs];
 };
 
+const extractVersionFromImageSetRef = (imageSetRefName?: string): string | undefined => {
+  if (!imageSetRefName) {
+    return undefined;
+  }
+  // Match pattern like "4.19.18" or "4.19" in strings like "img4.19.18-multi-appsub"
+  const versionMatch = imageSetRefName.match(/(\d+\.\d+)(?:\.\d+)?/);
+  if (versionMatch && versionMatch[1]) {
+    return versionMatch[1];
+  }
+  return undefined;
+};
+
 export const getAICluster = ({
   clusterDeployment,
   agentClusterInstall,
@@ -123,9 +141,13 @@ export const getAICluster = ({
   agents?: AgentK8sResource[];
   infraEnv?: InfraEnvK8sResource;
 }): Cluster => {
+  const imageSetRefName = agentClusterInstall?.spec?.imageSetRef?.name;
+  const extractedVersion = extractVersionFromImageSetRef(imageSetRefName);
+
   const installVersion =
     clusterDeployment.status?.installVersion ||
-    clusterDeployment.metadata?.labels?.[OCP_VERSION_MAJOR_MINOR];
+    clusterDeployment.metadata?.labels?.[OCP_VERSION_MAJOR_MINOR] ||
+    extractedVersion;
   const [status, statusInfo] = getClusterStatus(agentClusterInstall);
   const aiCluster: Cluster = {
     id: clusterDeployment.metadata?.uid || '',
@@ -174,6 +196,9 @@ export const getAICluster = ({
     cpuArchitecture: getClusterDeploymentCpuArchitecture(clusterDeployment, infraEnv),
     networkType: agentClusterInstall?.spec?.networking.networkType,
     controlPlaneCount: agentClusterInstall?.spec?.provisionRequirements.controlPlaneAgents || 3,
+    platform: {
+      type: (agentClusterInstall?.spec?.platformType?.toLowerCase() || 'baremetal') as PlatformType,
+    },
   };
   /*
   aiCluster.agentSelectorMasterLabels =

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

@@ -8,7 +8,7 @@ import {
 } from '../../types';
 import { CpuArchitecture, OpenshiftVersionOptionType } from '../../../common';
 import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
-import { isMajorMinorVersionEqualOrGreater } from '../../../common/utils';
+import { getComparableVersionInt } from '../../../common/utils';
 
 export const getVersionFromReleaseImage = (releaseImage = '') => {
   const match = /.+:(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(releaseImage);
@@ -123,5 +123,9 @@ export const getCurrentClusterVersion = (cv?: ClusterVersionK8sResource): string
 
 export const getNetworkType = (
   ocpVersion: OpenshiftVersionOptionType | undefined,
-): 'OVNKubernetes' | 'OpenShiftSDN' =>
-  isMajorMinorVersionEqualOrGreater(ocpVersion?.version, '4.12') ? 'OVNKubernetes' : 'OpenShiftSDN';
+): 'OVNKubernetes' | 'OpenShiftSDN' => {
+  const checkVersionNum = getComparableVersionInt(ocpVersion?.version || '');
+  const toVersionNum = getComparableVersionInt('4.12');
+
+  return !checkVersionNum || checkVersionNum >= toVersionNum ? 'OVNKubernetes' : 'OpenShiftSDN';
+};