@openshift-assisted/ui-lib 2.8.2-cim → 2.8.4-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,119 +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}
-                    >
-                      {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/ClusterDeploymentDetailsStep.tsx

@@ -17,7 +17,7 @@ import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } fro
 import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
 import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
 import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
-import { getAICluster, getOCPVersions } from '../helpers';
+import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
@@ -45,7 +45,10 @@ export const useDetailsFormik = ({
   clusterImages,
   usedClusterNames,
   infraEnv,
-}: UseDetailsFormikArgs): [ClusterDetailsValues, Lazy] => {
+}: UseDetailsFormikArgs): [
+  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
+  Lazy,
+] => {
   const { t } = useTranslation();
   const featureSupportLevels = useFeatureSupportLevel();
   const ocpVersions = getOCPVersions(clusterImages);
@@ -62,12 +65,21 @@ export const useDetailsFormik = ({
     [agentClusterInstall, clusterDeployment, agents, infraEnv],
   );
   const initialValues = React.useMemo(
-    () =>
-      getClusterDetailsInitialValues({
+    () => {
+      const initValues = getClusterDetailsInitialValues({
         managedDomains: [], // not supported
         cluster,
         ocpVersions,
-      }),
+      });
+
+      const ocpVersion = ocpVersions.find(
+        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
+      );
+      return {
+        ...initValues,
+        networkType: getNetworkType(ocpVersion),
+      };
+    },
     [], // eslint-disable-line react-hooks/exhaustive-deps
   );
 

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import * as Yup from 'yup';
-import { TestOptionsMessage } from 'yup';
 import { Formik, FormikConfig, useFormikContext } from 'formik';
 import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
 import { ClusterWizardStepHeader, useAlerts } from '../../../common';
@@ -74,19 +73,9 @@ const getInitialValues = ({
   };
 };
 
-const getMinHostsCount = (selectedHostsCount: number) => (selectedHostsCount === 4 ? 5 : 3);
-
 const getValidationSchema = (agentClusterInstall: AgentClusterInstallK8sResource, t: TFunction) => {
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
 
-  const getMinMessage: TestOptionsMessage<{ min: number }> = ({ min }) => {
-    const message = t('ai:Please select at least {{min}} hosts for the cluster', { min });
-    if (min === 5) {
-      return `${message} ${t('ai:or select just 3 hosts instead.')}`;
-    }
-    return `${message}.`;
-  };
-
   return Yup.lazy<ClusterDeploymentHostsSelectionValues>((values) => {
     return Yup.object<ClusterDeploymentHostsSelectionValues>().shape({
       hostCount: isSNOCluster ? Yup.number() : hostCountValidationSchema(t),
@@ -100,7 +89,7 @@ const getValidationSchema = (agentClusterInstall: AgentClusterInstallK8sResource
         ? Yup.array<string>()
             .min(1, t('ai:Please select one host for the cluster.'))
             .max(1, t('ai:Please select one host for the cluster.')) // TODO(jtomasek): replace this with Yup.array().length() after updating Yup
-        : Yup.array<string>().min(getMinHostsCount(values.selectedHostIds.length), getMinMessage),
+        : Yup.array<string>().min(3, t('ai:Please select at least 3 hosts for the cluster.')),
     });
   });
 };

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

@@ -37,8 +37,7 @@ const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscov
     infraEnvAgents.length > 1 &&
       errors.push(t('ai:Single node cluster cannot contain more than 1 host.'));
   } else {
-    (infraEnvAgents.length === 4 || infraEnvAgents.length < 3) &&
-      errors.push(t('ai:Cluster must have 3 or 5 and more hosts.'));
+    infraEnvAgents.length < 3 && errors.push(t('ai:Cluster must have at least 3 hosts.'));
   }
 
   if (infraEnvAgents.some((a) => !a.spec.approved)) {

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

@@ -25,9 +25,7 @@ const ClusterDeploymentHostsSelectionBasic: React.FC<ClusterDeploymentHostsSelec
   const { t } = useTranslation();
 
   React.useEffect(() => {
-    if (hostCount === 3) {
-      setFieldValue('useMastersAsWorkers', true);
-    }
+    setFieldValue('useMastersAsWorkers', hostCount === 3);
   }, [hostCount, setFieldValue]);
 
   return (
@@ -43,12 +41,6 @@ const ClusterDeploymentHostsSelectionBasic: React.FC<ClusterDeploymentHostsSelec
             minValue={isSNOCluster ? 1 : HOSTS_MIN_COUNT}
             maxValue={isSNOCluster ? 1 : HOSTS_MAX_COUNT}
             isDisabled={isSNOCluster}
-            formatValue={(newValue) => {
-              if (newValue === 4) {
-                return hostCount >= 4 ? 3 : 5;
-              }
-              return newValue;
-            }}
           />
         </GridItem>
 
@@ -58,7 +50,7 @@ const ClusterDeploymentHostsSelectionBasic: React.FC<ClusterDeploymentHostsSelec
             idPostfix="mastersasworkers"
             name="useMastersAsWorkers"
             label={t('ai:Run workloads on control plane hosts')}
-            isDisabled={hostCount < 5}
+            isDisabled={hostCount !== 3}
           />
         </GridItem>
 

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

@@ -19,7 +19,12 @@ const ClusterDeploymentWizardNavigation: React.FC<{
   const stepNames = wizardStepNames(t);
   return (
     <WizardNav>
-      <WizardNavItem key="installation-type" content="Installation type" step={0} isDisabled />
+      <WizardNavItem
+        key="installation-type"
+        content={t('ai:Installation type')}
+        step={0}
+        isDisabled
+      />
       <WizardNavItem
         key="cluster-details"
         content={stepNames['cluster-details']}
@@ -29,7 +34,7 @@ const ClusterDeploymentWizardNavigation: React.FC<{
         step={1}
         onNavItemClick={() => setCurrentStepId('cluster-details')}
       />
-      <WizardNavItem key="automation" content="Automation" step={2} isDisabled />
+      <WizardNavItem key="automation" content={t('ai:Automation')} step={2} isDisabled />
       {isCIMFlow(clusterDeployment) ? (
         <WizardNavItem
           key="hosts-selection"

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

@@ -15,6 +15,7 @@ import { ClusterDetailsValues } from '../../../common/components/clusterWizard/t
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ArmCheckbox from './ArmCheckbox';
 import { SNOControlGroup } from '../../../common';
+import { getNetworkType } from '../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -47,7 +48,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   forceOpenshiftVersion,
   extensionAfter,
 }) => {
-  const { values } = useFormikContext<ClusterDetailsValues>();
+  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
@@ -97,7 +98,13 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           {t('ai:OpenShift')} {forceOpenshiftVersion}
         </StaticTextField>
       ) : (
-        <OpenShiftVersionSelect versions={versions} />
+        <OpenShiftVersionSelect
+          versions={versions}
+          onChange={(value) => {
+            const ocpVersion = versions.find((v) => v.value === value);
+            setFieldValue('networkType', getNetworkType(ocpVersion));
+          }}
+        />
       )}
       <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
       <ArmCheckbox versions={versions} />

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

@@ -15,6 +15,7 @@ import { ClusterDeploymentK8sResource, AgentK8sResource } from '../../types';
 import { INFRAENV_GENERATED_AI_FLOW, BMH_HOSTNAME_ANNOTATION } from '../common/constants';
 import { gridSpans } from '@patternfly/react-core';
 import { getErrorMessage } from '../../../common/utils';
+
 export const shouldShowClusterDeploymentValidationOverview = (
   agentClusterInstall?: AgentClusterInstallK8sResource,
 ) => {
@@ -37,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) => {
@@ -111,9 +115,14 @@ export const getOnFetchEventsHandler =
   (
     fetchEvents: (url: string) => Promise<string>,
     aiNamespace: string,
+    agents: AgentK8sResource[],
     agentClusterInstall?: AgentClusterInstallK8sResource,
   ): EventListFetchProps['onFetchEvents'] =>
-  async (params, onSuccess, onError) => {
+  async (
+    { message, severities: severitiesFilter, hostIds, clusterLevel, deletedHosts },
+    onSuccess,
+    onError,
+  ) => {
     const eventsURL = getEventsURL(aiNamespace, agentClusterInstall);
     if (!eventsURL) {
       onError('Cannot determine events URL');
@@ -121,10 +130,51 @@ export const getOnFetchEventsHandler =
     }
     try {
       const result = await fetchEvents(eventsURL);
-      const data = formatEventsData(result);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      onSuccess(data);
+      let data = formatEventsData(result);
+      const allNames = data.filter((d) => d.hostId).map((d) => d.hostId);
+
+      const severities = {
+        critical: data.filter((d) => d.severity === 'critical').length,
+        error: data.filter((d) => d.severity === 'error').length,
+        info: data.filter((d) => d.severity === 'info').length,
+        warning: data.filter((d) => d.severity === 'warning').length,
+      };
+
+      if (message) {
+        data = data.filter((d) => d.message.includes(message));
+      }
+      if (severitiesFilter && severitiesFilter.length > 0) {
+        data = data.filter((d) => severitiesFilter.includes(d.severity));
+      }
+
+      if (clusterLevel || deletedHosts || (hostIds && hostIds.length > 0)) {
+        data = data.filter((d) => {
+          if (clusterLevel && d.clusterId && !d.hostId) {
+            return d;
+          }
+          if (hostIds && hostIds.length > 0) {
+            const names = agents
+              .filter((a) => a.metadata?.uid && hostIds.includes(a.metadata.uid))
+              .map((a) => a.metadata?.name);
+            if (d.hostId && names.includes(d.hostId)) {
+              return d;
+            }
+          }
+          if (deletedHosts) {
+            const deleted = allNames.filter((n) => !agents.some((a) => a.metadata?.name === n));
+            if (d.hostId && deleted.includes(d.hostId)) {
+              return d;
+            }
+          }
+          return false;
+        });
+      }
+
+      onSuccess({
+        data,
+        totalEvents: data.length,
+        severities,
+      });
     } catch (e) {
       onError(getErrorMessage(e));
     }

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

@@ -54,8 +54,8 @@ const getNetworkConfigurationValidationSchema = (
       ingressVip: vipValidationSchema(hostSubnets, values, initialValues.ingressVip),
       sshPublicKey: sshPublicKeyValidationSchema,
       hostSubnet: hostSubnetValidationSchema,
-      httpProxy: httpProxyValidationSchema(values, 'httpsProxy'),
-      httpsProxy: httpProxyValidationSchema(values, 'httpProxy'), // share the schema, httpS is currently not supported
+      httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),
+      httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy' }), // share the schema, httpS is currently not supported
       noProxy: noProxyValidationSchema,
     }),
   );

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

@@ -14,6 +14,5 @@ export const hostCountValidationSchema = (t: TFunction) => {
       HOSTS_MAX_COUNT,
       t('ai:Maximum hosts count {{HOSTS_MAX_COUNT}} reached.', { HOSTS_MAX_COUNT }),
     )
-    .test('not-four', t('ai:A cluster needs 2 or more worker nodes.'), (value) => value !== 4)
     .required(t('ai:Required field'));
 };

package/lib/cim/components/Hypershift/HostedClusterWizard/NetworkStep/NetworkStep.tsx

@@ -28,8 +28,8 @@ const getValidationSchema = (t: TFunction) =>
       clusterNetworkHostPrefix: values.isAdvanced
         ? hostPrefixValidationSchema(values.clusterNetworkCidr)
         : Yup.number(),
-      httpProxy: httpProxyValidationSchema(values, 'httpsProxy'),
-      httpsProxy: httpProxyValidationSchema(values, 'httpProxy'), // share the schema, httpS is currently not supported
+      httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),
+      httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy' }), // share the schema, httpS is currently not supported
       noProxy: noProxyValidationSchema,
       nodePortAddress:
         values.apiPublishingStrategy === 'NodePort'

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

@@ -21,5 +21,4 @@ export type NetworkStepProps = {
   formRef: React.Ref<FormikProps<NetworkFormValues>>;
   onValuesChanged: (values: NetworkFormValues, initRender: boolean) => void;
   initialValues: NetworkFormValues;
-  count: number;
 };

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

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { AgentK8sResource } from '../../../types';
 import { NodePoolK8sResource, HostedClusterK8sResource, AgentMachineK8sResource } from '../types';
 import NodePoolForm, { NodePoolFormValues } from './NodePoolForm';
-import { formikLabelsToLabels, labelsToFormikValue } from '../utils';
+import { labelsToFormikValue } from '../utils';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { getErrorMessage } from '../../../../common/utils';
 
@@ -57,11 +57,6 @@ const ManageHostsModal = ({
         path: '/spec/replicas',
       });
     }
-    patches.push({
-      op: 'replace',
-      value: formikLabelsToLabels(values.agentLabels),
-      path: '/spec/platform/agent/agentLabelSelector/matchLabels',
-    });
     try {
       await onSubmit(nodePool, patches);
       onClose();

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

@@ -15,7 +15,7 @@ export const getNodepoolAgents = (
       (am) =>
         am.metadata?.namespace ===
           `${hostedCluster.metadata?.namespace || ''}-${hostedCluster.metadata?.name || ''}` &&
-        am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.metadata?.name &&
+        am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.spec.infraID &&
         am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] === nodePool.metadata?.name &&
         am.status?.agentRef?.name &&
         am.status?.agentRef?.namespace,