@openshift-assisted/ui-lib 2.48.5 → 2.49.0

package/lib/cim/components/modals/CimConfiguration/persist.ts

@@ -1,17 +1,21 @@
-import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  k8sCreate,
+  k8sGet,
+  k8sListItems,
+  k8sPatch,
+  K8sResourceCommon,
+} from '@openshift-console/dynamic-plugin-sdk';
 import { AlertVariant } from '@patternfly/react-core';
 import { TFunction } from 'i18next';
 import { getErrorMessage } from '../../../../common/utils';
 
 import {
   AgentServiceConfigK8sResource,
-  convertOCPtoCIMResourceHeader,
-  CreateResourceFuncType,
-  GetResourceFuncType,
-  ListResourcesFuncType,
-  PatchResourceFuncType,
-  ResourcePatch,
+  AgentServiceConfigModel,
+  IngressControllerModel,
+  ProvisioningModel,
   RouteK8sResource,
+  RouteModel,
 } from '../../../types';
 import { LOCAL_STORAGE_ID_LAST_UPDATE_TIMESTAMP } from './utils';
 
@@ -32,14 +36,10 @@ const ASSISTED_IMAGE_SERVICE_ROUTE_PREFIX = 'assisted-image-service-multicluster
 const getAssistedImageServiceRoute = async (
   t: TFunction,
   setError: SetErrorFuncType,
-  listResources: ListResourcesFuncType,
 ): Promise<RouteK8sResource | undefined> => {
-  let allRoutes;
+  let allRoutes: RouteK8sResource[] = [];
   try {
-    allRoutes = (await listResources({
-      kind: 'Route',
-      apiVersion: 'route.openshift.io/v1',
-    })) as RouteK8sResource[];
+    allRoutes = await k8sListItems({ model: RouteModel, queryParams: {} });
   } catch (e) {
     // console.error('Failed to read all routes: ', allRoutes);
     setError({
@@ -50,7 +50,7 @@ const getAssistedImageServiceRoute = async (
   }
 
   const assistedImageServiceRoute = allRoutes?.find(
-    (r: RouteK8sResource) => r.metadata?.name === 'assisted-image-service',
+    (r) => r.metadata?.name === 'assisted-image-service',
   );
 
   if (!assistedImageServiceRoute?.spec?.host) {
@@ -92,7 +92,6 @@ const getClusterDomain = (
 const patchAssistedImageServiceRoute = async (
   t: TFunction,
   setError: SetErrorFuncType,
-  patchResource: PatchResourceFuncType,
 
   assistedImageServiceRoute: RouteK8sResource,
   domain: string,
@@ -102,7 +101,7 @@ const patchAssistedImageServiceRoute = async (
   const labels = assistedImageServiceRoute.metadata?.labels || {};
   labels['router-type'] = 'nlb';
 
-  const patches: ResourcePatch[] = [
+  const patches = [
     {
       op: 'replace',
       path: '/spec/host',
@@ -116,7 +115,11 @@ const patchAssistedImageServiceRoute = async (
   ];
 
   try {
-    await patchResource(convertOCPtoCIMResourceHeader(assistedImageServiceRoute), patches);
+    await k8sPatch({
+      model: RouteModel,
+      resource: assistedImageServiceRoute,
+      data: patches,
+    });
   } catch (e) {
     // console.error('Failed to patch assisted-image-service route: ', e, patches);
     setError({
@@ -128,15 +131,12 @@ const patchAssistedImageServiceRoute = async (
   return true;
 };
 
-export const isIngressController = async (getResource: GetResourceFuncType): Promise<boolean> => {
+export const isIngressController = async (): Promise<boolean> => {
   try {
-    await getResource({
-      apiVersion: 'operator.openshift.io/v1',
-      kind: 'IngressController',
-      metadata: {
-        name: 'ingress-controller-with-nlb',
-        namespace: 'openshift-ingress-operator',
-      },
+    await k8sGet({
+      name: 'ingress-controller-with-nlb',
+      ns: 'openshift-ingress-operator',
+      model: IngressControllerModel,
     });
 
     return true;
@@ -148,7 +148,6 @@ export const isIngressController = async (getResource: GetResourceFuncType): Pro
 const createIngressController = async (
   t: TFunction,
   setError: SetErrorFuncType,
-  createResource: CreateResourceFuncType,
 
   domain: string,
 ): Promise<boolean> => {
@@ -184,7 +183,7 @@ const createIngressController = async (
   };
 
   try {
-    await createResource(ingressController);
+    await k8sCreate({ model: IngressControllerModel, data: ingressController });
     return true;
   } catch (e) {
     // console.error('Create IngressController error: ', e);
@@ -199,24 +198,19 @@ const createIngressController = async (
 const patchProvisioningConfiguration = async ({
   t,
   setError,
-  patchResource,
-  getResource,
 }: {
   t: TFunction;
   setError: SetErrorFuncType;
-  patchResource: PatchResourceFuncType;
-  getResource: GetResourceFuncType;
 }) => {
   try {
-    const provisioning = (await getResource({
-      kind: 'Provisioning',
-      apiVersion: 'metal3.io/v1alpha1',
-      metadata: {
-        name: 'provisioning-configuration',
-      },
-    })) as K8sResourceCommon & { spec?: { watchAllNamespaces?: boolean } };
+    const provisioning = await k8sGet<
+      K8sResourceCommon & { spec?: { watchAllNamespaces?: boolean } }
+    >({
+      model: ProvisioningModel,
+      name: 'provisioning-configuration',
+    });
 
-    const patches: ResourcePatch[] = [
+    const patches = [
       {
         op: provisioning.spec?.watchAllNamespaces ? 'replace' : 'add',
         path: '/spec/watchAllNamespaces',
@@ -224,7 +218,11 @@ const patchProvisioningConfiguration = async ({
       },
     ];
 
-    await patchResource(convertOCPtoCIMResourceHeader(provisioning), patches);
+    await k8sPatch({
+      model: ProvisioningModel,
+      resource: provisioning,
+      data: patches,
+    });
   } catch (e) {
     // console.error('Failed to patch provisioning-configuration: ', e);
     setError({
@@ -238,18 +236,18 @@ const patchProvisioningConfiguration = async ({
 const createAgentServiceConfig = async ({
   t,
   setError,
-  createResource,
   dbVolSizeGiB,
   fsVolSizeGiB,
   imgVolSizeGiB,
+  ciscoIntersightURL,
 }: {
   t: TFunction;
   setError: SetErrorFuncType;
-  createResource: CreateResourceFuncType;
 
   dbVolSizeGiB: number;
   fsVolSizeGiB: number;
   imgVolSizeGiB: number;
+  ciscoIntersightURL?: string;
 }): Promise<boolean> => {
   try {
     const agentServiceConfig = {
@@ -257,6 +255,7 @@ const createAgentServiceConfig = async ({
       kind: 'AgentServiceConfig',
       metadata: {
         name: 'agent',
+        annotations: {},
       },
       spec: {
         databaseStorage: {
@@ -286,79 +285,32 @@ const createAgentServiceConfig = async ({
       },
     };
 
-    await createResource(agentServiceConfig);
-    return true;
-  } catch (e) {
-    // console.error('Failed to create AgentServiceConfig: ', e);
-    setError({
-      title: t('ai:Failed to create AgentServiceConfig'),
-      message: getErrorMessage(e),
-    });
-    return false;
-  }
-};
+    if (ciscoIntersightURL) {
+      agentServiceConfig.metadata = {
+        ...agentServiceConfig.metadata,
+        annotations: { ciscoIntersightURL },
+      };
+    }
 
-/* Following functions are tested but recently not used.
-const patchAgentServiceConfig = async ({
-  t,
-  setError,
-  patchResource,
-  agentServiceConfig,
-  imgVolSizeGB,
-}: {
-  t: TFunction;
-  setError: SetErrorFuncType;
-  patchResource: PatchResourceFuncType;
-  agentServiceConfig: AgentServiceConfigK8sResource;
+    await k8sCreate({
+      model: AgentServiceConfigModel,
+      data: agentServiceConfig,
+    });
 
-  imgVolSizeGB: number;
-}): Promise<boolean> => {
-  try {
-    const patches: ResourcePatch[] = [
-      {
-        op: 'replace',
-        path: '/spec/imageStorage/resources/requests/storage',
-        value: `${imgVolSizeGB}G`,
-      },
-    ];
-    await patchResource(agentServiceConfig, patches);
     return true;
   } catch (e) {
-    console.error('Failed to patch AgentServiceConfig: ', e);
     setError({
-      title: t('ai:Failed to update the AgentServiceConfig'),
+      title: t('ai:Failed to create AgentServiceConfig'),
+      message: getErrorMessage(e),
     });
     return false;
   }
 };
 
-export const onDeleteCimConfig = async ({
-  deleteResource,
-}: {
-  deleteResource: DeleteResourceFuncType;
-}) => {
-  try {
-    await deleteResource({
-      apiVersion: 'agent-install.openshift.io/v1beta1',
-      kind: 'AgentServiceConfig',
-      metadata: {
-        name: 'agent',
-        // cluster-scoped resource
-      },
-    });
-  } catch (e) {
-    console.error('Failed to delete AgentServiceConfig: ', e);
-  }
-};
-*/
 // https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.6/html/multicluster_engine/multicluster_engine_overview#enable-cim
 export const onEnableCIM = async ({
   t,
   setError,
-  createResource,
-  getResource,
-  listResources,
-  patchResource,
 
   agentServiceConfig,
   platform,
@@ -368,13 +320,10 @@ export const onEnableCIM = async ({
   imgVolSizeGiB,
 
   configureLoadBalancer,
+  ciscoIntersightURL,
 }: {
   t: TFunction;
   setError: SetErrorFuncType;
-  createResource: CreateResourceFuncType;
-  getResource: GetResourceFuncType;
-  listResources: ListResourcesFuncType;
-  patchResource: PatchResourceFuncType;
 
   agentServiceConfig?: AgentServiceConfigK8sResource;
   platform: string;
@@ -384,22 +333,21 @@ export const onEnableCIM = async ({
   imgVolSizeGiB: number;
 
   configureLoadBalancer: boolean;
+  ciscoIntersightURL?: string;
 }) => {
   if (['none', 'baremetal', 'openstack', 'vsphere'].includes(platform.toLocaleLowerCase())) {
-    await patchProvisioningConfiguration({ t, setError, patchResource, getResource });
+    await patchProvisioningConfiguration({ t, setError });
   }
 
-  if (agentServiceConfig) {
-    // console.log('The AgentServiceConfig recently can not be patched. Delete and create instead.');
-  } else {
+  if (!agentServiceConfig) {
     if (
       !(await createAgentServiceConfig({
         t,
         setError,
-        createResource,
         dbVolSizeGiB,
         fsVolSizeGiB,
         imgVolSizeGiB,
+        ciscoIntersightURL,
       }))
     ) {
       return false;
@@ -411,16 +359,11 @@ export const onEnableCIM = async ({
 
   if (configureLoadBalancer) {
     // Recently No to Yes only (since we do not delete the ingress controller)
-    if (await isIngressController(getResource)) {
-      // console.log('IngressController already present, we do not patch it.');
+    if (await isIngressController()) {
       return true /* Not an error */;
     }
 
-    const assistedImageServiceRoute = await getAssistedImageServiceRoute(
-      t,
-      setError,
-      listResources,
-    );
+    const assistedImageServiceRoute = await getAssistedImageServiceRoute(t, setError);
     if (!assistedImageServiceRoute) {
       return false;
     }
@@ -431,14 +374,8 @@ export const onEnableCIM = async ({
     }
 
     if (
-      !(await createIngressController(t, setError, createResource, domain)) ||
-      !(await patchAssistedImageServiceRoute(
-        t,
-        setError,
-        patchResource,
-        assistedImageServiceRoute,
-        domain,
-      ))
+      !(await createIngressController(t, setError, domain)) ||
+      !(await patchAssistedImageServiceRoute(t, setError, assistedImageServiceRoute, domain))
     ) {
       return false;
     }

package/lib/cim/components/modals/CimConfiguration/types.ts

@@ -1,24 +1,12 @@
-import {
-  CreateResourceFuncType,
-  GetResourceFuncType,
-  ListResourcesFuncType,
-  PatchResourceFuncType,
-} from '../../../types';
 import { AgentServiceConfigK8sResource } from '../../../types/k8s/agent-service-config';
 
-export type CimConfiguratioProps = {
+export type CimConfigurationValues = {
   dbVolSize: number;
-  dbVolSizeValidation?: string;
-  setDbVolSize: (v: number) => void;
   fsVolSize: number;
-  fsVolSizeValidation?: string;
-  setFsVolSize: (v: number) => void;
   imgVolSize: number;
-  imgVolSizeValidation?: string;
-  setImgVolSize: (v: number) => void;
   configureLoadBalancer: boolean;
-  configureLoadBalancerInitial: boolean;
-  setConfigureLoadBalancer: (v: boolean) => void;
+  addCiscoIntersightUrl: boolean;
+  ciscoIntersightURL: string;
 };
 
 export type CimConfigProgressAlertProps = {
@@ -26,12 +14,14 @@ export type CimConfigProgressAlertProps = {
   assistedServiceDeploymentUrl: string;
 };
 
-export type CimConfigurationFormProps = CimConfiguratioProps & {
-  onClose: () => void;
+export type CimConfigurationFormFieldsProps = {
   isEdit: boolean;
   isInProgressPeriod: boolean;
   docConfigUrl: string;
   docConfigAwsUrl: string;
+  platform: string;
+  configureLoadBalancerInitial: boolean;
+  setConfigureLoadBalancerInitial: (value: boolean) => void;
 };
 
 export type CimConfigurationModalProps = {
@@ -42,11 +32,6 @@ export type CimConfigurationModalProps = {
   docDisconnectedUrl: string;
   docConfigUrl: string;
   docConfigAwsUrl: string;
-
-  createResource: CreateResourceFuncType;
-  getResource: GetResourceFuncType;
-  listResources: ListResourcesFuncType;
-  patchResource: PatchResourceFuncType;
 };
 
 export type CimConfigMissingAlertProps = {

package/lib/cim/components/modals/EditProxyModal.tsx

@@ -106,7 +106,7 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
                 <Form>
                   <ProxyInputFields />
                   {error && (
-                    <Alert variant="danger" title={t('ai:An error occured')} isInline>
+                    <Alert variant="danger" title={t('ai:An error occurred')} isInline>
                       {error}
                     </Alert>
                   )}

package/lib/cim/components/modals/EditSSHKeyModal.tsx

@@ -64,7 +64,7 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
             onClose();
           } catch (err) {
             const error = err as Error;
-            setError(error?.message || t('ai:An error occured'));
+            setError(error?.message || t('ai:An error occurred'));
           }
         }}
         validateOnMount

package/lib/cim/components/modals/MassApproveAgentModal.tsx

@@ -33,7 +33,7 @@ const hostnameColumn = (agents: AgentK8sResource[], t: TFunction): TableRow<Host
     },
     cell: (host) => {
       const agent = agents.find((a) => a.metadata?.uid === host.id);
-      const hostname = agent?.spec.hostname || agent?.status?.inventory.hostname;
+      const hostname = agent?.spec?.hostname || agent?.status?.inventory?.hostname;
       return {
         title: <ApproveTableRow agent={agent}>{hostname}</ApproveTableRow>,
         props: { 'data-testid': 'hostname' },
@@ -113,7 +113,7 @@ const MassApproveAgentModal: React.FC<MassApproveAgentModalProps> = ({
       onClose();
     } catch (err) {
       setError({
-        title: t('ai:An error occured while approving agents'),
+        title: t('ai:An error occurred while approving agents'),
         message: getErrorMessage(err),
       });
       setProgress(null);

package/lib/cim/hooks/index.tsx

@@ -0,0 +1,2 @@
+export * from './useConfigMaps';
+export * from './useAgentServiceConfig';

package/lib/cim/hooks/types.tsx

@@ -0,0 +1,8 @@
+import { WatchK8sResource } from '@openshift-console/dynamic-plugin-sdk';
+
+export type K8sWatchHookListProps = Omit<
+  WatchK8sResource,
+  'groupVersionKind' | 'name' | 'isList'
+> | null;
+
+export type K8sWatchHookProps = Pick<WatchK8sResource, 'name' | 'namespace' | 'isList'> | null;

package/lib/cim/hooks/useAgentServiceConfig.tsx

@@ -0,0 +1,15 @@
+import { useK8sWatchResource } from './useK8sWatchResource';
+import { AgentServiceConfigK8sResource } from '../types';
+import { K8sWatchHookProps } from './types';
+
+export const useAgentServiceConfig = (props: K8sWatchHookProps) =>
+  useK8sWatchResource<AgentServiceConfigK8sResource>(
+    {
+      groupVersionKind: {
+        group: 'agent-install.openshift.io',
+        kind: 'AgentServiceConfig',
+        version: 'v1beta1',
+      },
+    },
+    props,
+  );

package/lib/cim/hooks/useConfigMaps.tsx

@@ -0,0 +1,14 @@
+import { useK8sWatchResource } from './useK8sWatchResource';
+import { ConfigMapK8sResource } from '../types';
+import { K8sWatchHookProps } from './types';
+
+export const useConfigMaps = (props: K8sWatchHookProps) =>
+  useK8sWatchResource<ConfigMapK8sResource[]>(
+    {
+      groupVersionKind: {
+        kind: 'ConfigMap',
+        version: 'v1',
+      },
+    },
+    props,
+  );

package/lib/cim/hooks/useK8sWatchResource.tsx

@@ -0,0 +1,27 @@
+import {
+  useK8sWatchResource as consoleWatch,
+  K8sResourceCommon,
+  WatchK8sResource,
+} from '@openshift-console/dynamic-plugin-sdk';
+
+export type WatchK8sResult<R extends K8sResourceCommon | K8sResourceCommon[]> = [
+  R,
+  boolean,
+  unknown,
+];
+
+export const useK8sWatchResource = <R extends K8sResourceCommon | K8sResourceCommon[]>(
+  resource: Pick<WatchK8sResource, 'groupVersionKind'>,
+  props?: Omit<WatchK8sResource, 'groupVersionKind'> | null,
+): WatchK8sResult<R> => {
+  // eslint-disable-next-line
+  const [data, loaded, error] = consoleWatch<R>(
+    props !== null
+      ? {
+          ...resource,
+          ...(props || {}),
+        }
+      : null,
+  );
+  return [data, error ? true : loaded, error as unknown];
+};

package/lib/cim/types/index.ts

@@ -1,4 +1,4 @@
 export * from './fromOCP';
 export * from './k8s';
 export * from './metal3';
-export * from './resources';
+export * from './models';

package/lib/cim/types/k8s/agent-cluster-install.ts

@@ -58,6 +58,7 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
     };
     holdInstallation?: boolean;
     platformType: string;
+    manifestsConfigMapRefs?: { name: string }[];
   };
   status?: {
     apiVIP?: string;

package/lib/cim/types/models.tsx

@@ -0,0 +1,56 @@
+import { K8sModel } from '@openshift-console/dynamic-plugin-sdk/lib/api/common-types';
+
+export const AgentClusterInstallModel: K8sModel = {
+  kind: 'AgentClusterInstall',
+  label: 'AgentClusterInstall',
+  labelPlural: 'AgentClusterInstalls',
+  plural: 'agentclusterinstalls',
+  apiVersion: 'v1beta1',
+  apiGroup: 'extensions.hive.openshift.io',
+  namespaced: true,
+  abbr: 'ACI',
+};
+
+export const AgentServiceConfigModel: K8sModel = {
+  kind: 'AgentServiceConfig',
+  label: 'AgentServiceConfig',
+  labelPlural: 'AgentServiceConfigs',
+  plural: 'agentserviceconfigs',
+  apiVersion: 'v1beta1',
+  apiGroup: 'agent-install.openshift.io',
+  namespaced: false,
+  abbr: 'asc',
+};
+
+export const IngressControllerModel: K8sModel = {
+  kind: 'IngressController',
+  label: 'IngressController',
+  labelPlural: 'IngressControllers',
+  plural: 'ingresscontrollers',
+  apiVersion: 'v1',
+  apiGroup: 'operator.openshift.io',
+  namespaced: true,
+  abbr: 'ic',
+};
+
+export const RouteModel: K8sModel = {
+  kind: 'Route',
+  label: 'Route',
+  labelPlural: 'Routes',
+  plural: 'routes',
+  apiVersion: 'v1',
+  apiGroup: 'route.openshift.io',
+  namespaced: true,
+  abbr: 'rt',
+};
+
+export const ProvisioningModel: K8sModel = {
+  kind: 'Provisioning',
+  label: 'Provisioning',
+  labelPlural: 'Provisionings',
+  plural: 'provisionings',
+  apiVersion: 'v1alpha1',
+  apiGroup: 'metal3.io',
+  namespaced: false,
+  abbr: 'p',
+};

package/lib/cim/utils.ts

@@ -1,3 +1,5 @@
+import { Patch } from '@openshift-console/dynamic-plugin-sdk';
+import { isEqual } from 'lodash-es';
 import { StatusCondition } from './types';
 
 export function getConditionByType<ConditionType>(
@@ -6,3 +8,13 @@ export function getConditionByType<ConditionType>(
 ): StatusCondition<ConditionType> | undefined {
   return conditions.find((c) => c.type === type);
 }
+
+export const appendPatch = <V>(patches: Patch[], path: string, newVal?: V, existingVal?: V) => {
+  if (!isEqual(newVal, existingVal)) {
+    patches.push({
+      op: existingVal === undefined ? 'add' : 'replace',
+      path,
+      value: newVal,
+    });
+  }
+};

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

@@ -75,11 +75,6 @@ const HostsAPI = {
       },
     );
   },
-  unbindHost(infraEnvId: InfraEnv['id'], hostId: Host['id']) {
-    return client.post<Host, AxiosResponse<Host>, never>(
-      `${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/unbind`,
-    );
-  },
 };
 
 export default HostsAPI;

package/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx

@@ -10,9 +10,10 @@ import {
 } from '@patternfly/react-core';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 import { getFieldId, StaticField } from '../..';
-import { useField } from 'formik';
 import toNumber from 'lodash-es/toNumber';
 import OcmTNADisclaimer from './OcmTNADisclaimer';
+import { ClusterDetailsValues } from '../clusterWizard';
+import { useField, useFormikContext } from 'formik';
 
 const isItemEnabled = (value: number, allowHighlyAvailable?: boolean, allowTNA?: boolean) => {
   switch (value) {
@@ -44,6 +45,7 @@ const ControlPlaneNodesDropdown = ({
 }) => {
   const { t } = useTranslation();
   const [{ name, value: selectedValue }, , { setValue }] = useField<number>('controlPlaneCount');
+  const { setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const [controlPlanelOpen, setControlPlanelOpen] = React.useState(false);
   const fieldId = getFieldId(name, 'input');
 
@@ -85,6 +87,13 @@ const ControlPlaneNodesDropdown = ({
     e?: React.MouseEvent<Element, MouseEvent>,
     value?: string | number,
   ) => {
+    if (value === 1) {
+      setFieldValue('userManagedNetworking', true);
+      setFieldValue('platform', 'none');
+    } else {
+      setFieldValue('userManagedNetworking', false);
+      setFieldValue('platform', 'baremetal');
+    }
     setValue(toNumber(value));
     setControlPlanelOpen(false);
   };