@openshift-assisted/ui-lib 2.9.6-cim → 2.9.8-cim

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

@@ -19,7 +19,7 @@ import {
 } from '../../types';
 import ClusterDeploymentCredentials from './ClusterDeploymentCredentials';
 import { shouldShowClusterCredentials, shouldShowClusterInstallationProgress } from './helpers';
-import { EventsModalButton } from '../../../common/components/ui/eventsModal';
+import { EventsModal } from '../../../common/components/ui/eventsModal';
 import ClusterDeploymentDetailsTable from './ClusterDeploymentDetailsTable';
 import { FetchSecret } from './types';
 import { getClusterProperties, getConsoleUrl } from '../helpers/clusterDeployment';
@@ -45,6 +45,7 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   const [progressCardExpanded, setProgressCardExpanded] = React.useState(true);
   const [inventoryCardExpanded, setInventoryCardExpanded] = React.useState(true);
   const [detailsCardExpanded, setDetailsCardExpanded] = React.useState(true);
+  const [isEventsModalOpen, setIsEventsModalOpen] = React.useState(false);
 
   const clusterAgents = agents.filter(
     (a) =>
@@ -60,120 +61,129 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   );
   const { t } = useTranslation();
   return (
-    <Stack hasGutter>
-      {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+    <>
+      <Stack hasGutter>
+        {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+          <StackItem>
+            <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+              <CardHeader
+                onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+                toggleButtonProps={{
+                  id: 'progress-card-toggle-button',
+                  'aria-label': 'Cluster installation process',
+                  'aria-labelledby': 'titleId progress-card-toggle-button',
+                  'aria-expanded': progressCardExpanded,
+                }}
+              >
+                <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              </CardHeader>
+              <CardExpandableContent>
+                <CardBody>
+                  <Stack hasGutter>
+                    {shouldShowClusterCredentials(agentClusterInstall) && (
+                      <StackItem>
+                        <ClusterDeploymentCredentials
+                          clusterDeployment={clusterDeployment}
+                          agentClusterInstall={agentClusterInstall}
+                          agents={clusterAgents}
+                          fetchSecret={fetchSecret}
+                          consoleUrl={getConsoleUrl(clusterDeployment)}
+                        />
+                      </StackItem>
+                    )}
+                    <StackItem>
+                      <ClusterDeploymentKubeconfigDownload
+                        clusterDeployment={clusterDeployment}
+                        agentClusterInstall={agentClusterInstall}
+                        fetchSecret={fetchSecret}
+                      />{' '}
+                      <Button
+                        id="cluster-events-button"
+                        variant={ButtonVariant.link}
+                        style={{ textAlign: 'right' }}
+                        onClick={() => setIsEventsModalOpen(true)}
+                      >
+                        {t('ai:View cluster events')}
+                      </Button>
+                    </StackItem>
+                  </Stack>
+                </CardBody>
+              </CardExpandableContent>
+            </Card>
+          </StackItem>
+        )}
         <StackItem>
-          <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+          <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
             <CardHeader
-              onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+              onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
               toggleButtonProps={{
-                id: 'progress-card-toggle-button',
-                'aria-label': 'Cluster installation process',
-                'aria-labelledby': 'titleId progress-card-toggle-button',
-                'aria-expanded': progressCardExpanded,
+                id: 'inventory-card-toggle-button',
+                'aria-label': 'Hosts inventory',
+                'aria-labelledby': 'titleId inventory-card-toggle-button',
+                'aria-expanded': inventoryCardExpanded,
               }}
             >
-              <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
             </CardHeader>
             <CardExpandableContent>
               <CardBody>
-                <Stack hasGutter>
-                  {shouldShowClusterCredentials(agentClusterInstall) && (
-                    <StackItem>
-                      <ClusterDeploymentCredentials
-                        clusterDeployment={clusterDeployment}
-                        agentClusterInstall={agentClusterInstall}
-                        agents={clusterAgents}
-                        fetchSecret={fetchSecret}
-                        consoleUrl={getConsoleUrl(clusterDeployment)}
-                      />
-                    </StackItem>
-                  )}
-                  <StackItem>
-                    <ClusterDeploymentKubeconfigDownload
-                      clusterDeployment={clusterDeployment}
-                      agentClusterInstall={agentClusterInstall}
-                      fetchSecret={fetchSecret}
-                    />{' '}
-                    <EventsModalButton
-                      id="cluster-events-button"
-                      entityKind="cluster"
-                      cluster={cluster}
-                      title={t('ai:Cluster Events')}
-                      variant={ButtonVariant.link}
-                      style={{ textAlign: 'right' }}
-                      onFetchEvents={onFetchEvents}
-                      ButtonComponent={Button}
-                      disablePagination
-                    >
-                      {t('ai:View cluster events')}
-                    </EventsModalButton>
-                  </StackItem>
-                </Stack>
+                <ClusterDeploymentDetailsTable
+                  agents={clusterAgents}
+                  agentClusterInstall={agentClusterInstall}
+                />
+              </CardBody>
+            </CardExpandableContent>
+          </Card>
+        </StackItem>
+        <StackItem>
+          <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
+            <CardHeader
+              onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
+              toggleButtonProps={{
+                id: 'details-card-toggle-button',
+                'aria-label': 'Details',
+                'aria-labelledby': 'titleId details-card-toggle-button',
+                'aria-expanded': detailsCardExpanded,
+              }}
+            >
+              <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
+            </CardHeader>
+            <CardExpandableContent>
+              <CardBody>
+                <ClusterPropertiesList
+                  leftItems={[
+                    clusterProperties.name,
+                    clusterProperties.openshiftVersion,
+                    clusterProperties.clusterId,
+                    clusterProperties.installedTimestamp,
+                    clusterProperties.baseDnsDomain,
+                  ]}
+                  rightItems={[
+                    clusterProperties.apiVip,
+                    clusterProperties.ingressVip,
+                    clusterProperties.clusterNetworkCidr,
+                    clusterProperties.clusterNetworkHostPrefix,
+                    clusterProperties.serviceNetworkCidr,
+                  ]}
+                />
               </CardBody>
             </CardExpandableContent>
           </Card>
         </StackItem>
+      </Stack>
+      {isEventsModalOpen && (
+        <EventsModal
+          entityKind="cluster"
+          cluster={cluster}
+          title={t('ai:Cluster Events')}
+          onFetchEvents={onFetchEvents}
+          hostId={undefined}
+          disablePagination
+          isOpen
+          onClose={() => setIsEventsModalOpen(false)}
+        />
       )}
-      <StackItem>
-        <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
-          <CardHeader
-            onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
-            toggleButtonProps={{
-              id: 'inventory-card-toggle-button',
-              'aria-label': 'Hosts inventory',
-              'aria-labelledby': 'titleId inventory-card-toggle-button',
-              'aria-expanded': inventoryCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterDeploymentDetailsTable
-                agents={clusterAgents}
-                agentClusterInstall={agentClusterInstall}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-      <StackItem>
-        <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
-          <CardHeader
-            onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
-            toggleButtonProps={{
-              id: 'details-card-toggle-button',
-              'aria-label': 'Details',
-              'aria-labelledby': 'titleId details-card-toggle-button',
-              'aria-expanded': detailsCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterPropertiesList
-                leftItems={[
-                  clusterProperties.name,
-                  clusterProperties.openshiftVersion,
-                  clusterProperties.clusterId,
-                  clusterProperties.installedTimestamp,
-                  clusterProperties.baseDnsDomain,
-                ]}
-                rightItems={[
-                  clusterProperties.apiVip,
-                  clusterProperties.ingressVip,
-                  clusterProperties.clusterNetworkCidr,
-                  clusterProperties.clusterNetworkHostPrefix,
-                  clusterProperties.serviceNetworkCidr,
-                ]}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-    </Stack>
+    </>
   );
 };
 

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

@@ -14,6 +14,7 @@ type ClusterDeploymentDetailsFormProps = {
   clusterDeployment?: ClusterDeploymentK8sResource;
   agentClusterInstall?: AgentClusterInstallK8sResource;
   extensionAfter?: ClusterDetailsFormFieldsProps['extensionAfter'];
+  isNutanix?: boolean;
 };
 
 const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
@@ -21,8 +22,12 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
   clusterDeployment,
   clusterImages,
   extensionAfter,
+  isNutanix,
 }) => {
-  const ocpVersions = React.useMemo(() => getOCPVersions(clusterImages), [clusterImages]);
+  const ocpVersions = React.useMemo(
+    () => getOCPVersions(clusterImages, isNutanix),
+    [clusterImages, isNutanix],
+  );
   const forceOpenshiftVersion = agentClusterInstall
     ? getSelectedVersion(clusterImages, agentClusterInstall)
     : undefined;
@@ -45,6 +50,7 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
           isEditFlow={isEditFlow}
           forceOpenshiftVersion={forceOpenshiftVersion}
           extensionAfter={extensionAfter}
+          isNutanix={isNutanix}
         />
       </StackItem>
     </Stack>

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

@@ -36,6 +36,7 @@ type UseDetailsFormikArgs = {
   agentClusterInstall?: AgentClusterInstallK8sResource;
   agents?: AgentK8sResource[];
   infraEnv?: InfraEnvK8sResource;
+  isNutanix: boolean;
 };
 
 export const useDetailsFormik = ({
@@ -45,10 +46,11 @@ export const useDetailsFormik = ({
   clusterImages,
   usedClusterNames,
   infraEnv,
+  isNutanix,
 }: UseDetailsFormikArgs): [ClusterDetailsValues, Lazy] => {
   const { t } = useTranslation();
   const featureSupportLevels = useFeatureSupportLevel();
-  const ocpVersions = getOCPVersions(clusterImages);
+  const ocpVersions = getOCPVersions(clusterImages, isNutanix);
   const cluster = React.useMemo(
     () =>
       clusterDeployment && agentClusterInstall
@@ -98,6 +100,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
   onClose,
   isPreviewOpen,
   infraEnv,
+  isNutanix,
 }) => {
   const { addAlert } = useAlerts();
   const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
@@ -109,6 +112,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
     clusterImages,
     usedClusterNames,
     infraEnv,
+    isNutanix,
   });
   const next = () =>
     isCIMFlow(clusterDeployment)
@@ -165,6 +169,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
                   agentClusterInstall={agentClusterInstall}
                   clusterDeployment={clusterDeployment}
                   clusterImages={clusterImages}
+                  isNutanix={isNutanix}
                 />
               </GridItem>
             </Grid>

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

@@ -140,6 +140,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   aiConfigMap,
   onEditRole: onEditRoleInit,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
@@ -279,6 +280,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
             onSetInstallationDiskId={onSetInstallationDiskId}
             onAutoSelectChange={onAutoSelectChange}
             onHostSelect={onHostSelect}
+            isNutanix={isNutanix}
           />
         </GridItem>
       </Grid>

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

@@ -26,6 +26,7 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   onAutoSelectChange,
   onHostSelect,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
   const { autoSelectHosts } = values;
@@ -35,18 +36,19 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   const cdNamespace = clusterDeployment?.metadata?.namespace;
   const cpuArchitecture = getClusterDeploymentCpuArchitecture(clusterDeployment);
 
-  const availableAgents = React.useMemo(
-    () =>
-      getAgentsForSelection(agents).filter(
-        (agent) =>
-          (agent.spec.clusterDeploymentName?.name === cdName &&
-            agent.spec.clusterDeploymentName?.namespace === cdNamespace) ||
-          (!agent.spec.clusterDeploymentName?.name &&
-            !agent.spec.clusterDeploymentName?.namespace &&
-            agent.status?.inventory.cpu?.architecture === cpuArchitecture),
-      ),
-    [agents, cdNamespace, cdName, cpuArchitecture],
-  );
+  const availableAgents = React.useMemo(() => {
+    const filtered = getAgentsForSelection(agents).filter(
+      (agent) =>
+        (agent.spec.clusterDeploymentName?.name === cdName &&
+          agent.spec.clusterDeploymentName?.namespace === cdNamespace) ||
+        (!agent.spec.clusterDeploymentName?.name &&
+          !agent.spec.clusterDeploymentName?.namespace &&
+          agent.status?.inventory.cpu?.architecture === cpuArchitecture),
+    );
+    return isNutanix
+      ? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
+      : filtered;
+  }, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
   const { t } = useTranslation();
   return (
     <Grid hasGutter>

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

@@ -53,6 +53,7 @@ type ClusterDeploymentNetworkingFormProps = {
   onEditHost: AgentTableActions['onEditHost'];
   onEditRole: AgentTableActions['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
+  isNutanix: boolean;
 };
 
 const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormProps> = ({
@@ -68,6 +69,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
   onEditHost,
   onEditRole,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { values, touched, setFieldValue, setFieldTouched } =
     useFormikContext<ClusterDeploymentNetworkingValues>();
@@ -139,7 +141,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 hostSubnets={hostSubnets}
                 isVipDhcpAllocationDisabled
                 defaultNetworkSettings={defaultNetworkSettings}
-                hideManagedNetworking={getIsSNOCluster(agentClusterInstall)}
+                hideManagedNetworking={getIsSNOCluster(agentClusterInstall) || isNutanix}
               />
             </GridItem>
           </Grid>

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

@@ -35,6 +35,7 @@ type NetworkingFormProps = {
   onEditRole: AgentTableActions['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   isPreviewOpen: ClusterDeploymentDetailsNetworkingProps['isPreviewOpen'];
+  isNutanix: ClusterDeploymentDetailsNetworkingProps['isNutanix'];
 };
 
 const NetworkingForm: React.FC<NetworkingFormProps> = ({
@@ -47,6 +48,7 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
   onEditRole,
   isPreviewOpen,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const [showFormErrors, setShowFormErrors] = React.useState(false);
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
@@ -149,6 +151,7 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
             onEditRole={onEditRole}
             isPreviewOpen={isPreviewOpen}
             onSetInstallationDiskId={onSetInstallationDiskId}
+            isNutanix={isNutanix}
           />
         </GridItem>
       </Grid>

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

@@ -36,6 +36,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
   fetchKlusterletAddonConfig,
   onSaveISOParams,
   onCreateBMH,
+  isNutanix,
   ...rest
 }) => {
   const [currentStepId, setCurrentStepId] = React.useState<ClusterDeploymentWizardStepsType>(
@@ -70,6 +71,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
               aiConfigMap={aiConfigMap}
               onEditRole={hostActions.onEditRole}
               onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+              isNutanix={isNutanix}
             />
           );
         }
@@ -115,6 +117,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
             fetchInfraEnv={fetchInfraEnv}
             isPreviewOpen={isPreviewOpen}
             onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+            isNutanix={isNutanix}
           />
         );
       case 'review':
@@ -142,6 +145,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
             onClose={onClose}
             isPreviewOpen={isPreviewOpen}
             infraEnv={infraEnv}
+            isNutanix={isNutanix}
           />
         );
     }

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

@@ -21,6 +21,7 @@ export type ClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
   extensionAfter?: { [key: string]: React.ReactElement };
   versions: OpenshiftVersionOptionType[];
+  isNutanix?: boolean;
 };
 
 export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
@@ -46,6 +47,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   versions,
   forceOpenshiftVersion,
   extensionAfter,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
@@ -99,8 +101,12 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       ) : (
         <OpenShiftVersionSelect versions={versions} />
       )}
-      <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
-      <ArmCheckbox versions={versions} />
+      {!isNutanix && (
+        <>
+          <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
+          <ArmCheckbox versions={versions} />
+        </>
+      )}
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
       {!isEditFlow && <PullSecret />}
       {extensionAfter?.['pullSecret'] && extensionAfter['pullSecret']}

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

@@ -38,16 +38,19 @@ export const shouldShowClusterInstallationProgress = (
   agentClusterInstall?: AgentClusterInstallK8sResource,
 ) => {
   const [clusterStatus] = getClusterStatus(agentClusterInstall);
-  return [
-    'preparing-for-installation',
-    'installing',
-    'installing-pending-user-action',
-    'finalizing',
-    'installed',
-    'error',
-    'cancelled',
-    'adding-hosts',
-  ].includes(clusterStatus);
+  return (
+    [
+      'preparing-for-installation',
+      'installing',
+      'installing-pending-user-action',
+      'finalizing',
+      'installed',
+      'error',
+      'cancelled',
+      'adding-hosts',
+      'ready',
+    ].includes(clusterStatus) && !agentClusterInstall?.spec?.holdInstallation
+  );
 };
 
 export const isInstallationInProgress = (agentClusterInstall: AgentClusterInstallK8sResource) => {

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

@@ -87,6 +87,7 @@ export type ClusterDeploymentDetailsStepProps = ClusterDeploymentDetailsProps &
   onSaveDetails: (values: ClusterDeploymentDetailsValues) => Promise<unknown>;
   onClose: () => void;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type ClusterDeploymentDetailsNetworkingProps = Pick<
@@ -100,6 +101,7 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type AgentSelectorChangeProps = {
@@ -163,6 +165,7 @@ export type ClusterDeploymentWizardProps = {
   docVersion: string; // ACM version
   onCreateBmcByYaml: UploadActionModalProps['onCreateBmcByYaml'];
   provisioningConfigResult: ProvisioningConfigResult;
+  isNutanix: boolean;
 };
 
 export type FetchSecret = (name: string, namespace: string) => Promise<SecretK8sResource>;
@@ -176,6 +179,7 @@ export type ClusterDeploymentHostsSelectionProps = {
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   onAutoSelectChange: VoidFunction;
   onHostSelect: VoidFunction;
+  isNutanix: boolean;
 };
 
 export type InfraEnvAgentTableProps = Pick<

package/lib/cim/components/Hypershift/hooks/useSupportedOCPVersions.ts

@@ -13,7 +13,7 @@ export const useSupportedOCPVersions = (
   supportedVersionsCM?: ConfigMapK8sResource,
 ) => {
   return React.useMemo(() => {
-    const ocpVersions = getOCPVersions(clusterImages);
+    const ocpVersions = getOCPVersions(clusterImages, false);
     const supportedVersionsString = supportedVersionsCM?.data?.['supported-versions'];
     if (supportedVersionsString) {
       try {

package/lib/cim/components/Hypershift/utils/nodepool.ts

@@ -2,7 +2,7 @@ import { AgentK8sResource } from '../../../types';
 import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
 
 const CLUSTER_NAME_LABEL = 'cluster.x-k8s.io/cluster-name';
-const NODEPOOL_NAME_ANNOTATION = 'cluster.x-k8s.io/cloned-from-name';
+const NODEPOOL_NAME_ANNOTATION = 'hypershift.openshift.io/nodePool';
 
 export const getNodepoolAgents = (
   nodePool: NodePoolK8sResource,
@@ -16,7 +16,8 @@ export const getNodepoolAgents = (
         am.metadata?.namespace ===
           `${hostedCluster.metadata?.namespace || ''}-${hostedCluster.metadata?.name || ''}` &&
         am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.spec.infraID &&
-        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] === nodePool.metadata?.name &&
+        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] ===
+          `${nodePool.metadata?.namespace || ''}/${nodePool.metadata?.name || ''}` &&
         am.status?.agentRef?.name &&
         am.status?.agentRef?.namespace,
     )

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

@@ -31,7 +31,6 @@ import {
   RadioField,
   PopoverIcon,
   pullSecretValidationSchema,
-  OCP_STATIC_IP_DOC,
   CheckboxField,
   AdditionalNTPSourcesField,
   richNameValidationSchema,
@@ -42,6 +41,7 @@ import {
   locationValidationMessages,
   ntpSourceValidationSchema,
   CpuArchitecture,
+  getOCPStaticIPDocLink,
 } from '../../../common';
 
 import './infra-env.css';
@@ -118,6 +118,7 @@ type InfraEnvFormProps = {
   onValuesChanged?: (values: EnvironmentStepFormValues) => void;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
@@ -125,6 +126,7 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
   children,
   pullSecret,
   sshPublicKey,
+  docVersion,
 }) => {
   const { values, setFieldValue } = useFormikContext<EnvironmentStepFormValues>();
   const { t } = useTranslation();
@@ -194,7 +196,13 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
                                 icon={<ExternalLinkAltIcon />}
                                 iconPosition="right"
                                 isInline
-                                onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+                                onClick={() =>
+                                  window.open(
+                                    getOCPStaticIPDocLink(docVersion),
+                                    '_blank',
+                                    'noopener',
+                                  )
+                                }
                               >
                                 {t('ai:View documentation')}
                               </Button>
@@ -282,6 +290,7 @@ type InfraEnvFormPageProps = InfraEnvFormProps & {
   formRef: React.Ref<FormikProps<EnvironmentStepFormValues>>;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 export const InfraEnvFormPage: React.FC<InfraEnvFormPageProps> = ({

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

@@ -36,9 +36,16 @@ const getSupportLevelFromChannel = (
 
 export const getOCPVersions = (
   clusterImageSets: ClusterImageSetK8sResource[],
+  isNutanix?: boolean | undefined,
 ): OpenshiftVersionOptionType[] => {
   const versions = clusterImageSets
-    .filter((clusterImageSet) => clusterImageSet.metadata?.labels?.visible !== 'false')
+    .filter((clusterImageSet) => {
+      let supportedPlatform = true;
+      if (isNutanix && clusterImageSet.spec?.releaseImage) {
+        supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
+      }
+      return supportedPlatform && clusterImageSet.metadata?.labels?.visible !== 'false';
+    })
     .map((clusterImageSet): OpenshiftVersionOptionType => {
       const version = getVersionFromReleaseImage(clusterImageSet.spec?.releaseImage);
       return {