@openshift-assisted/ui-lib 2.16.2-cim → 2.16.4-cim

package/lib/ocm/components/clusters/NewClusterPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { PageSectionVariants, PageSection } from '@patternfly/react-core';
+import { PageSection } from '@patternfly/react-core';
 import { AlertsContextProvider } from '../../../common';
 import ClusterBreadcrumbs from './ClusterBreadcrumbs';
 import { ClusterDefaultConfigurationProvider } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
@@ -25,10 +25,10 @@ const NewClusterPageGeneric = ({ children }: React.PropsWithChildren<unknown>) =
             <OpenShiftVersionsContextProvider>
               <NewFeatureSupportLevelProvider loadingUi={<ClusterLoading />}>
                 {children}
-                <PageSection variant={PageSectionVariants.light}>
+                <PageSection hasBodyWrapper={false} isFilled>
                   <AssistedInstallerHeader />
                 </PageSection>
-                <PageSection variant={PageSectionVariants.light} isFilled>
+                <PageSection hasBodyWrapper={false} isFilled>
                   <ClusterWizardContextProvider>
                     <NewClusterWizard />
                   </ClusterWizardContextProvider>

package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx

@@ -1,8 +1,9 @@
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import React from 'react';
-import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
-import { Text, TextList, TextListItem, TextContent } from '@patternfly/react-core';
+import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
+import { t_global_color_status_info_100 as infoColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_info_100';
+import { Content } from '@patternfly/react-core';
 import {
   FeatureId,
   FeatureIdToSupportLevel,
@@ -22,6 +23,7 @@ import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
 } from '../../../common/components/newFeatureSupportLevels';
+import { useFeature } from '../../hooks/use-feature';
 
 const getFeatureReviewText = (featureId: FeatureId): string => {
   switch (featureId) {
@@ -64,14 +66,16 @@ const getPreviewFeatureList = (supportLevelMap: FeatureIdToSupportLevel) => {
     return null;
   }
   const featureList = previewSupportLevels[supportLevel].map((featureId: FeatureId) => (
-    <TextListItem key={featureId}>{getFeatureReviewText(featureId)}</TextListItem>
+    <Content component="li" key={featureId}>
+      {getFeatureReviewText(featureId)}
+    </Content>
   ));
   return (
     <>
-      <TextListItem>
+      <Content component="li">
         {getPreviewSupportLevelTitle(supportLevel)}
-        <TextList>{featureList}</TextList>
-      </TextListItem>
+        <Content component="ul">{featureList}</Content>
+      </Content>
     </>
   );
 };
@@ -83,21 +87,21 @@ export const LimitedSupportedCluster = ({
   clusterFeatureSupportLevels: FeatureIdToSupportLevel;
   showVersionWarning: boolean;
 }) => (
-  <TextContent>
+  <>
     {showVersionWarning && (
-      <Text>
-        <UiIcon size="sm" icon={<InfoCircleIcon color="var(--pf-v5-global--info-color--100)" />} />
+      <Content component="p">
+        <UiIcon size="sm" icon={<InfoCircleIcon color={infoColor.var} />} />
         &nbsp;The installed OpenShift version is not production-ready
-      </Text>
+      </Content>
     )}
     {Object.keys(clusterFeatureSupportLevels).length > 0 && (
       <>
-        <UiIcon size="sm" icon={<InfoCircleIcon color="var(--pf-v5-global--info-color--100)" />} />
+        <UiIcon size="sm" icon={<InfoCircleIcon color={infoColor.var} />} />
         &nbsp;Your cluster will be subject to support limitations because it includes:
-        <TextList>{getPreviewFeatureList(clusterFeatureSupportLevels)}</TextList>
+        <Content component="ul">{getPreviewFeatureList(clusterFeatureSupportLevels)}</Content>
       </>
     )}
-  </TextContent>
+  </>
 );
 
 export const FullySupportedCluster = () => (
@@ -124,6 +128,7 @@ export const getSupportLevelInfo = (
   featureSupportLevelData: NewFeatureSupportLevelData,
   isSupportedOpenShiftVersion: (version?: string) => boolean,
   t: TFunction,
+  isSingleClusterFeatureEnabled?: boolean,
 ) => {
   const limitedClusterFeatures = getLimitedFeatureSupportLevels(
     cluster,
@@ -134,7 +139,10 @@ export const getSupportLevelInfo = (
   return {
     limitedClusterFeatures,
     hasSupportedVersion,
-    isFullySupported: hasSupportedVersion && Object.keys(limitedClusterFeatures || {}).length === 0,
+    isFullySupported:
+      hasSupportedVersion &&
+      Object.keys(limitedClusterFeatures || {}).length === 0 &&
+      !isSingleClusterFeatureEnabled,
   };
 };
 
@@ -142,11 +150,25 @@ const SupportLevel = ({ cluster }: SupportLevelProps) => {
   const { t } = useTranslation();
   const featureSupportLevelData = useNewFeatureSupportLevel();
   const { isSupportedOpenShiftVersion } = useOpenShiftVersionsContext();
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const { limitedClusterFeatures, hasSupportedVersion, isFullySupported } =
     React.useMemo<SupportLevelMemo>(
-      () => getSupportLevelInfo(cluster, featureSupportLevelData, isSupportedOpenShiftVersion, t),
-      [cluster, featureSupportLevelData, t, isSupportedOpenShiftVersion],
+      () =>
+        getSupportLevelInfo(
+          cluster,
+          featureSupportLevelData,
+          isSupportedOpenShiftVersion,
+          t,
+          isSingleClusterFeatureEnabled,
+        ),
+      [
+        cluster,
+        featureSupportLevelData,
+        t,
+        isSupportedOpenShiftVersion,
+        isSingleClusterFeatureEnabled,
+      ],
     );
 
   if (!limitedClusterFeatures) {
@@ -162,11 +184,11 @@ const SupportLevel = ({ cluster }: SupportLevelProps) => {
         ) : (
           <LimitedSupportedCluster
             clusterFeatureSupportLevels={limitedClusterFeatures}
-            showVersionWarning={!hasSupportedVersion}
+            showVersionWarning={!hasSupportedVersion || isSingleClusterFeatureEnabled}
           />
         )
       }
-      classNameValue={'pf-v5-u-mb-md'}
+      classNameValue={'pf-v6-u-mb-md'}
       testId="feature-support-levels"
     />
   );

package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts

@@ -294,9 +294,7 @@ const getOpenShiftAIDisabledReason = (
   if (isArm) {
     return `${operatorTitle} is not available when ARM CPU architecture is selected.`;
   }
-  if (isSNO(cluster)) {
-    return `${operatorTitle} is not available when deploying a Single Node OpenShift.`;
-  }
+
   if (!isSupported) {
     return `The installer cannot currently enable ${operatorTitle} with the selected OpenShift version, but it can be enabled later through the OpenShift Console once the installation is complete.`;
   }

package/lib/ocm/components/hosts/DeleteHostModal.tsx

@@ -1,5 +1,13 @@
 import React from 'react';
-import { Modal, ModalVariant, Button, ButtonVariant } from '@patternfly/react-core';
+import {
+  Button,
+  ButtonVariant,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  ModalVariant,
+} from '@patternfly/react-core';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type DeleteHostModalProps = {
@@ -17,8 +25,12 @@ const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModa
       isOpen={isOpen}
       onClose={onClose}
       variant={ModalVariant.small}
-      titleIconVariant="warning"
-      actions={[
+    >
+      <ModalHeader title={t('ai:Remove host?')} titleIconVariant="warning" />
+      <ModalBody>
+        {t('ai:Host {{hostname}} will be removed', { hostname: hostname || '' })}
+      </ModalBody>
+      <ModalFooter>
         <Button
           data-testid="delete-host-submit"
           key="confirm"
@@ -26,13 +38,11 @@ const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModa
           onClick={onDelete}
         >
           {t('ai:Remove host')}
-        </Button>,
+        </Button>
         <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
           {t('ai:Cancel')}
-        </Button>,
-      ]}
-    >
-      {t('ai:Host {{hostname}} will be removed', { hostname: hostname || '' })}
+        </Button>
+      </ModalFooter>
     </Modal>
   );
 };

package/lib/ocm/components/hosts/HostRequirementsContent.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { List, ListItem, Text, TextContent } from '@patternfly/react-core';
+import { List, ListItem, Content } from '@patternfly/react-core';
 import { DISK_WRITE_SPEED_LINK, ErrorState, ExternalLink, LoadingState } from '../../../common';
 import { useClusterPreflightRequirements } from '../../hooks';
 import { fileSize } from '../../../common/utils';
@@ -41,9 +41,9 @@ const HostRequirementsContent = ({
 
   if (isAddingHosts) {
     return (
-      <TextContent>
-        <Text component={'p'}>{`Worker hosts must have at least ${contentForWorkerNodes}`}</Text>
-      </TextContent>
+      <Content
+        component={'p'}
+      >{`Worker hosts must have at least ${contentForWorkerNodes}`}</Content>
     );
   }
 

package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx

@@ -40,9 +40,10 @@ const HostRowDetailExpand = ({ obj: host }: ExpandComponentProps<Host>) => (
 
 type HostsDiscoveryTableProps = {
   cluster: Cluster;
+  hosts: Host[];
 };
 
-const HostsDiscoveryTable = ({ cluster }: HostsDiscoveryTableProps) => {
+const HostsDiscoveryTable = ({ cluster, hosts }: HostsDiscoveryTableProps) => {
   const {
     onEditHost,
     actionChecks,
@@ -55,6 +56,7 @@ const HostsDiscoveryTable = ({ cluster }: HostsDiscoveryTableProps) => {
     onMassDeleteHost,
     ...modalProps
   } = useHostsTable(cluster);
+
   const { wizardPerPage, setWizardPerPage } = useClusterWizardContext();
 
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
@@ -83,7 +85,6 @@ const HostsDiscoveryTable = ({ cluster }: HostsDiscoveryTableProps) => {
     [t, onEditHost, actionChecks.canEditHostname, actionChecks.canEditRole, onEditRole, cluster],
   );
 
-  const hosts = cluster.hosts || [];
   const paginationProps = usePagination(hosts.length, wizardPerPage, setWizardPerPage);
   const itemIDs = hosts.map((h) => h.id);
   const showBulkActions = !(isViewerMode || isSNOCluster);

package/lib/ocm/components/hosts/ResetHostModal.tsx

@@ -1,5 +1,13 @@
 import React from 'react';
-import { Modal, ModalVariant, Button, ButtonVariant } from '@patternfly/react-core';
+import {
+  Button,
+  ButtonVariant,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  ModalVariant,
+} from '@patternfly/react-core';
 
 type ResetHostModalProps = {
   hostname?: string;
@@ -9,12 +17,10 @@ type ResetHostModalProps = {
 };
 
 const ResetHostModal: React.FC<ResetHostModalProps> = ({ isOpen, hostname, onClose, onReset }) => (
-  <Modal
-    title="Reset Host"
-    isOpen={isOpen}
-    onClose={onClose}
-    variant={ModalVariant.small}
-    actions={[
+  <Modal isOpen={isOpen} onClose={onClose} variant={ModalVariant.small}>
+    <ModalHeader title="Reset Host" />
+    <ModalBody>Are you sure you want to reset host{` ${hostname || ''}`} ?</ModalBody>
+    <ModalFooter>
       <Button
         data-testid="reset-host-submit"
         key="confirm"
@@ -22,13 +28,11 @@ const ResetHostModal: React.FC<ResetHostModalProps> = ({ isOpen, hostname, onClo
         onClick={onReset}
       >
         Reset
-      </Button>,
+      </Button>
       <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
         Cancel
-      </Button>,
-    ]}
-  >
-    Are you sure you want to reset host{` ${hostname || ''}`} ?
+      </Button>
+    </ModalFooter>
   </Modal>
 );
 

package/lib/ocm/components/hosts/UpdateDay2ApiVipForm.tsx

@@ -5,8 +5,8 @@ import {
   ButtonVariant,
   ButtonType,
   Form,
-  ModalBoxBody,
-  ModalBoxFooter,
+  ModalBody,
+  ModalFooter,
 } from '@patternfly/react-core';
 import { Formik } from 'formik';
 import {
@@ -75,7 +75,7 @@ const UpdateDay2ApiVipForm: React.FC<UpdateDay2ApiVipFormProps> = ({
       {({ handleSubmit, status, setStatus, isSubmitting, isValid, dirty }) => {
         return (
           <Form onSubmit={handleSubmit}>
-            <ModalBoxBody>
+            <ModalBody>
               <GridGap>
                 <AlertFormikError
                   status={status as StatusErrorType}
@@ -89,8 +89,8 @@ const UpdateDay2ApiVipForm: React.FC<UpdateDay2ApiVipFormProps> = ({
                   isRequired
                 />
               </GridGap>
-            </ModalBoxBody>
-            <ModalBoxFooter>
+            </ModalBody>
+            <ModalFooter>
               <Button
                 key="submit"
                 type={ButtonType.submit}
@@ -101,7 +101,7 @@ const UpdateDay2ApiVipForm: React.FC<UpdateDay2ApiVipFormProps> = ({
               <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
                 Cancel
               </Button>
-            </ModalBoxFooter>
+            </ModalFooter>
           </Form>
         );
       }}

package/lib/ocm/components/hosts/UpdateDay2ApiVipModal.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Modal, ModalVariant } from '@patternfly/react-core';
 import UpdateDay2ApiVipForm, { UpdateDay2ApiVipFormProps } from './UpdateDay2ApiVipForm';
+import { Modal, ModalHeader, ModalVariant } from '@patternfly/react-core';
 
 type UpdateDay2ApiVipModalProps = {
   isOpen: boolean;
@@ -13,12 +13,11 @@ const UpdateDay2ApiVipModal: React.FC<UpdateDay2ApiVipModalProps> = ({
 }) => (
   <Modal
     aria-label="Update cluster hostname"
-    title="Update cluster hostname"
     isOpen={isOpen}
     variant={ModalVariant.small}
-    hasNoBodyWrapper
     onClose={onClose}
   >
+    <ModalHeader title="Update cluster hostname" />
     <UpdateDay2ApiVipForm {...props} onClose={onClose} />
   </Modal>
 );

package/lib/ocm/components/ui/InfoLinkWithModal.tsx

@@ -4,6 +4,9 @@ import {
   ButtonVariant,
   IconComponentProps,
   Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   ModalProps,
 } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
@@ -46,11 +49,10 @@ const InfoLinkWithModal = ({
         )}
         {linkText}
       </Button>
-      <Modal
-        title={modalTitle}
-        id={modalId}
-        isOpen={isModalOpen}
-        actions={[
+      <Modal id={modalId} isOpen={isModalOpen} onClose={handleModalClose} variant={modalVariant}>
+        <ModalHeader title={modalTitle} />
+        <ModalBody>{children}</ModalBody>
+        <ModalFooter>
           <Button
             id={closebuttonId}
             key="close"
@@ -58,12 +60,8 @@ const InfoLinkWithModal = ({
             onClick={handleModalClose}
           >
             Close
-          </Button>,
-        ]}
-        onClose={handleModalClose}
-        variant={modalVariant}
-      >
-        {children}
+          </Button>
+        </ModalFooter>
       </Modal>
     </>
   );

package/lib/ocm/hooks/index.ts

@@ -5,4 +5,5 @@ export { default as usePullSecret } from './usePullSecret';
 export { default as useClusterPreflightRequirements } from './useClusterPreflightRequirements';
 export { default as useUISettings } from './useUISettings';
 export { default as useInfraEnv } from './useInfraEnv';
+export { default as useInfraEnvHosts } from './useInfraEnvHosts';
 export { useFeatureDetection } from './use-feature-detection';

package/lib/ocm/hooks/useInfraEnvHosts.ts

@@ -0,0 +1,60 @@
+import React from 'react';
+import useInfraEnvId from './useInfraEnvId';
+import { CpuArchitecture, DEFAULT_POLLING_INTERVAL } from '../../common';
+import { getErrorMessage } from '../../common/utils';
+import { InfraEnvsAPI } from '../services/apis';
+import InfraEnvIdsCacheService from '../services/InfraEnvIdsCacheService';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
+
+const useInfraEnvHosts = (
+  clusterId: Cluster['id'],
+  cpuArchitecture: CpuArchitecture,
+  clusterName?: string,
+  pullSecret?: string,
+  openshiftVersion?: string,
+) => {
+  const [hosts, setHosts] = React.useState<Host[]>();
+  const [error, setError] = React.useState('');
+  const { infraEnvId, error: infraEnvIdError } = useInfraEnvId(
+    clusterId,
+    cpuArchitecture,
+    clusterName,
+    pullSecret,
+    openshiftVersion,
+  );
+
+  const getHosts = React.useCallback(async () => {
+    try {
+      if (infraEnvId) {
+        const { data: hostsData } = await InfraEnvsAPI.getHosts(infraEnvId);
+        setHosts(hostsData);
+      }
+    } catch (e) {
+      // Invalidate this cluster's cached data
+      InfraEnvIdsCacheService.removeInfraEnvId(clusterId, cpuArchitecture);
+      setError(getErrorMessage(e));
+    }
+  }, [clusterId, cpuArchitecture, infraEnvId]);
+
+  React.useEffect(() => {
+    if (infraEnvIdError) {
+      setHosts(undefined);
+      setError(infraEnvIdError);
+    } else {
+      if (infraEnvId) {
+        // Initial fetch
+        void getHosts();
+
+        // Set up polling to refetch hosts periodically
+        const intervalId = setInterval(() => {
+          void getHosts();
+        }, DEFAULT_POLLING_INTERVAL);
+
+        return () => clearInterval(intervalId);
+      }
+    }
+  }, [getHosts, infraEnvId, infraEnvIdError]);
+
+  return { hosts, error, isLoading: !hosts && !error };
+};
+export default useInfraEnvHosts;

package/lib/ocm/hooks/useInfraEnvId.ts

@@ -7,6 +7,7 @@ import {
   InfraEnv,
   InfraEnvCreateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeature } from './use-feature';
 
 export default function useInfraEnvId(
   clusterId: Cluster['id'],
@@ -17,10 +18,15 @@ export default function useInfraEnvId(
 ) {
   const [infraEnvId, setInfraEnv] = React.useState<InfraEnv['id']>();
   const [error, setError] = React.useState('');
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const findInfraEnvId = React.useCallback(async () => {
     try {
-      const infraEnvId = await InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
+      const infraEnvId = await InfraEnvsService.getInfraEnvId(
+        clusterId,
+        cpuArchitecture,
+        isSingleClusterFeatureEnabled,
+      );
       if (infraEnvId && !(infraEnvId instanceof Error)) {
         setInfraEnv(infraEnvId);
       } else {
@@ -39,7 +45,14 @@ export default function useInfraEnvId(
     } catch (e) {
       setError(getErrorMessage(e));
     }
-  }, [clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion]);
+  }, [
+    clusterId,
+    cpuArchitecture,
+    isSingleClusterFeatureEnabled,
+    pullSecret,
+    clusterName,
+    openshiftVersion,
+  ]);
 
   React.useEffect(() => {
     if (!clusterId) {

package/lib/ocm/hooks/useLateBinding.ts

@@ -0,0 +1,71 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { CpuArchitecture, useAlerts } from '../../common';
+import useInfraEnvHosts from './useInfraEnvHosts';
+import HostsService from '../services/HostsService';
+import { getErrorMessage } from '../../common/utils';
+import { useFeature } from './use-feature';
+
+const useLateBinding = (cluster: Cluster): boolean => {
+  const [isBinding, setIsBinding] = useState(false);
+  const { addAlert, removeAlert, alerts } = useAlerts();
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
+
+  const {
+    hosts: infraEnvHosts,
+    error: infraEnvError,
+    isLoading: infraEnvLoading,
+  } = useInfraEnvHosts(
+    isSingleClusterFeatureEnabled ? cluster.id : '',
+    cluster.cpuArchitecture
+      ? (cluster.cpuArchitecture as CpuArchitecture)
+      : CpuArchitecture.USE_DAY1_ARCHITECTURE,
+    cluster.name,
+    undefined,
+    cluster.openshiftVersion,
+  );
+
+  const bindHosts = useCallback(async () => {
+    if (infraEnvHosts && !infraEnvError && !infraEnvLoading && isSingleClusterFeatureEnabled) {
+      for (const host of infraEnvHosts) {
+        if (host.clusterId !== cluster.id) {
+          setIsBinding(true);
+          try {
+            const alertKey = alerts.find((alert) => alert.key === host.id)?.key;
+            if (alertKey) {
+              removeAlert(alertKey);
+            }
+            await HostsService.bind(host, cluster.id);
+          } catch (error) {
+            addAlert({
+              title: `Failed to bind host ${host.requestedHostname || ''}`,
+              message: getErrorMessage(error),
+              key: host.id,
+            });
+          } finally {
+            setIsBinding(false);
+          }
+        }
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    infraEnvHosts,
+    infraEnvError,
+    infraEnvLoading,
+    isSingleClusterFeatureEnabled,
+    cluster.id,
+    addAlert,
+    removeAlert,
+  ]);
+
+  useEffect(() => {
+    if (isSingleClusterFeatureEnabled) {
+      void bindHosts();
+    }
+  }, [isSingleClusterFeatureEnabled, bindHosts]);
+
+  return infraEnvLoading || isBinding;
+};
+
+export default useLateBinding;

package/lib/ocm/services/BundleService.ts

@@ -1,8 +1,18 @@
 import BundleAPI from '../../common/api/assisted-service/BundleAPI';
 
 const BundleService = {
-  async listBundles() {
-    const { data: bundles } = await BundleAPI.list();
+  async listBundles(
+    openshiftVersion?: string,
+    cpuArchitecture?: string,
+    platformType?: string,
+    featureIds?: string,
+  ) {
+    const { data: bundles } = await BundleAPI.list(
+      openshiftVersion,
+      cpuArchitecture,
+      platformType,
+      featureIds,
+    );
     return bundles;
   },
   async listOperatorsByBundle(bundleName: string) {

package/lib/ocm/services/ClustersService.ts

@@ -26,7 +26,11 @@ const ClustersService = {
     return hosts.find((host) => host.id === hostId);
   },
 
-  async create(params: ClusterCreateParamsWithStaticNetworking, isAssistedMigration?: boolean) {
+  async create(
+    params: ClusterCreateParamsWithStaticNetworking,
+    isAssistedMigration?: boolean,
+    isSingleClusterFeatureEnabled?: boolean,
+  ) {
     if (isAssistedMigration) {
       params.tags = AI_ASSISTED_MIGRATION_TAG;
     }
@@ -44,7 +48,9 @@ const ClustersService = {
       infraEnvCreateParams.imageType = 'minimal-iso';
     }
 
-    await InfraEnvsService.create(infraEnvCreateParams);
+    if (!isSingleClusterFeatureEnabled) {
+      await InfraEnvsService.create(infraEnvCreateParams);
+    }
 
     return cluster;
   },
@@ -165,5 +171,11 @@ const ClustersService = {
       this.getUpdateManifestParams(existingManifest, updatedManifest),
     );
   },
+  registerDisconnected(params: { name: string; openshiftVersion: string }) {
+    return ClustersAPI.registerDisconnected({
+      name: params.name,
+      openshiftVersion: params.openshiftVersion,
+    });
+  },
 };
 export default ClustersService;

package/lib/ocm/services/HostsService.ts

@@ -1,4 +1,5 @@
 import {
+  Cluster,
   Disk,
   DiskRole,
   Host,
@@ -84,6 +85,14 @@ const HostsService = {
     return HostsAPI.installHost(host.infraEnvId, host.id);
   },
 
+  bind(host: Host, clusterId: Cluster['id']) {
+    if (!host.infraEnvId) {
+      throw new Error(`Cannot bind host ${host.id}, missing infraEnvId`);
+    }
+
+    return HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
+  },
+
   installAll(hosts: Host[]) {
     const promises = [];
     for (const host of hosts) {