@openshift-assisted/ui-lib 2.16.5-cim → 2.17.1-cim

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/EditBMHModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Modal, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalHeader, ModalVariant } from '@patternfly/react-core';
 import BMCForm from '../Agent/BMCForm';
 import { SecretK8sResource } from '../../types';
 import { LoadingState } from '../../../common';
@@ -52,13 +52,12 @@ const EditBMHModal: React.FC<EditBMHModalProps> = ({
   return (
     <Modal
       aria-label={t('ai:Edit BMH dialog')}
-      title={t('ai:Edit BMH')}
       isOpen={isOpen}
       onClose={onClose}
       variant={ModalVariant.small}
-      hasNoBodyWrapper
       id="edit-bmh-modal"
     >
+      <ModalHeader title={t('ai:Edit BMH')} />
       {isLoading ? (
         <LoadingState />
       ) : (

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

@@ -5,8 +5,9 @@ import {
   ButtonVariant,
   Form,
   Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   ModalVariant,
   Stack,
   StackItem,
@@ -39,13 +40,12 @@ const EditNtpSourcesModal: React.FC<EditNtpSourcesModalProps> = ({
   return (
     <Modal
       aria-label={t('ai:Edit Ntp sources dialog')}
-      title={t('ai:Edit NTP sources')}
       isOpen={isOpen}
       onClose={onClose}
       variant={ModalVariant.small}
-      hasNoBodyWrapper
       id="edit-ntp-sources-modal"
     >
+      <ModalHeader title={t('ai:Edit NTP sources')} />
       <Formik<EditNtpSourcesFormikValues>
         initialValues={{
           enableNtpSources: infraEnv.spec?.additionalNTPSources ? 'additional' : 'auto',
@@ -69,7 +69,7 @@ const EditNtpSourcesModal: React.FC<EditNtpSourcesModalProps> = ({
         }: FormikProps<EditNtpSourcesFormikValues>) => {
           return (
             <>
-              <ModalBoxBody>
+              <ModalBody>
                 <Form>
                   <Stack hasGutter>
                     <StackItem>
@@ -111,8 +111,8 @@ const EditNtpSourcesModal: React.FC<EditNtpSourcesModalProps> = ({
                     )}
                   </Stack>
                 </Form>
-              </ModalBoxBody>
-              <ModalBoxFooter>
+              </ModalBody>
+              <ModalFooter>
                 {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
                 <Button onClick={submitForm} isDisabled={isSubmitting || !isValid}>
                   {t('ai:Save')}
@@ -120,7 +120,7 @@ const EditNtpSourcesModal: React.FC<EditNtpSourcesModalProps> = ({
                 <Button onClick={onClose} variant={ButtonVariant.secondary}>
                   {t('ai:Cancel')}
                 </Button>
-              </ModalBoxFooter>
+              </ModalFooter>
             </>
           );
         }}

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

@@ -6,8 +6,9 @@ import {
   ButtonVariant,
   Form,
   Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   ModalVariant,
   Stack,
   StackItem,
@@ -45,7 +46,7 @@ const Footer = ({ onClose }: { onClose: VoidFunction }) => {
   const { t } = useTranslation();
   const { isSubmitting, submitForm, isValid } = useFormikContext();
   return (
-    <ModalBoxFooter>
+    <ModalFooter>
       <Button
         onClick={() => void submitForm()}
         isDisabled={isSubmitting || !isValid}
@@ -56,7 +57,7 @@ const Footer = ({ onClose }: { onClose: VoidFunction }) => {
       <Button onClick={onClose} variant={ButtonVariant.secondary}>
         {t('ai:Cancel')}
       </Button>
-    </ModalBoxFooter>
+    </ModalFooter>
   );
 };
 
@@ -74,15 +75,15 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
     !!infraEnv.spec?.proxy?.httpProxy ||
     !!infraEnv.spec?.proxy?.httpsProxy ||
     !!infraEnv.spec?.proxy?.noProxy;
+
   return (
     <Modal
       aria-label={t('ai:Edit proxy settings')}
-      title={t('ai:Edit proxy settings')}
       isOpen
       onClose={onClose}
       variant={ModalVariant.medium}
-      hasNoBodyWrapper
     >
+      <ModalHeader title={t('ai:Edit proxy settings')} />
       <Formik<ProxyFieldsType>
         initialValues={{
           httpProxy: infraEnv.spec?.proxy?.httpProxy,
@@ -102,7 +103,7 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
         }}
       >
         <>
-          <ModalBoxBody>
+          <ModalBody>
             <Stack hasGutter>
               <StackItem>
                 <Alert isInline variant="warning" title={warningMsg} />
@@ -118,7 +119,7 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
                 </Form>
               </StackItem>
             </Stack>
-          </ModalBoxBody>
+          </ModalBody>
           <Footer onClose={onClose} />
         </>
       </Formik>

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

@@ -6,8 +6,9 @@ import {
   Button,
   ButtonVariant,
   Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   ModalVariant,
   Stack,
   StackItem,
@@ -76,7 +77,7 @@ const EditPullSecretForm: React.FC<EditPullSecretFormProps> = ({
   }
   return (
     <>
-      <ModalBoxBody>
+      <ModalBody>
         <Stack hasGutter>
           <StackItem>{body}</StackItem>
         </Stack>
@@ -85,8 +86,8 @@ const EditPullSecretForm: React.FC<EditPullSecretFormProps> = ({
             <Alert title={submitError} variant="danger" isInline />
           </StackItem>
         )}
-      </ModalBoxBody>
-      <ModalBoxFooter>
+      </ModalBody>
+      <ModalFooter>
         <Button
           // eslint-disable-next-line @typescript-eslint/no-misused-promises
           onClick={submitForm}
@@ -97,7 +98,7 @@ const EditPullSecretForm: React.FC<EditPullSecretFormProps> = ({
         <Button onClick={onClose} variant={ButtonVariant.secondary}>
           {t('ai:Cancel')}
         </Button>
-      </ModalBoxFooter>
+      </ModalFooter>
     </>
   );
 };
@@ -123,13 +124,12 @@ const EditPullSecretModal: React.FC<EditPullSecretModalProps> = ({
   return (
     <Modal
       aria-label={t('ai:Edit pull secret dialog')}
-      title={t('ai:Edit pull secret')}
       isOpen={isOpen}
       onClose={onClose}
       variant={ModalVariant.small}
-      hasNoBodyWrapper
       id="edit-pull-secret-modal"
     >
+      <ModalHeader title={t('ai:Edit pull secret')} />
       <Formik<EditPullSecretFormikValues>
         initialValues={{
           pullSecret: undefined,

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

@@ -5,8 +5,9 @@ import {
   Button,
   ButtonVariant,
   Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   ModalVariant,
   Stack,
   StackItem,
@@ -50,13 +51,12 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
   return (
     <Modal
       aria-label={t('ai:Edit SSH public key dialog')}
-      title={t('ai:Edit SSH public key')}
       isOpen={isOpen}
       onClose={onClose}
       variant={ModalVariant.small}
-      hasNoBodyWrapper
       id="edit-ssh-key-modal"
     >
+      <ModalHeader title={t('ai:Edit SSH public key')} />
       <Formik<EditSSHKeyFormikValues>
         initialValues={{
           sshPublicKey: infraEnv.spec?.sshAuthorizedKey || '',
@@ -73,9 +73,9 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
         }}
         validateOnMount
       >
-        {({ isSubmitting, isValid, submitForm }: FormikProps<EditSSHKeyModalProps>) => (
+        {({ isSubmitting, isValid, submitForm }: FormikProps<EditSSHKeyFormikValues>) => (
           <>
-            <ModalBoxBody>
+            <ModalBody>
               <Stack hasGutter>
                 <StackItem>
                   <Alert isInline variant="warning" title={warningMsg} />
@@ -89,16 +89,15 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
                   </StackItem>
                 )}
               </Stack>
-            </ModalBoxBody>
-            <ModalBoxFooter>
-              {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
-              <Button onClick={submitForm} isDisabled={isSubmitting || !isValid}>
+            </ModalBody>
+            <ModalFooter>
+              <Button onClick={() => void submitForm()} isDisabled={isSubmitting || !isValid}>
                 {t('ai:Save')}
               </Button>
               <Button onClick={onClose} variant={ButtonVariant.secondary}>
                 {t('ai:Cancel')}
               </Button>
-            </ModalBoxFooter>
+            </ModalFooter>
           </>
         )}
       </Formik>