refactored k8 second pass

opendatahub-io · Jun 25, 2024 · 9210700 · 9210700
1 parent 1c5b791
commit 9210700
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 122 deletions.
diff --git a/frontend/src/__mocks__/mockServiceAccountK8sResource.ts b/frontend/src/__mocks__/mockServiceAccountK8sResource.ts
@@ -1,5 +1,5 @@
 import { genUID } from '~/__mocks__/mockUtils';
-import { ServiceAccountKind } from '~/k8sTypes';
+import { K8sModelCommonMetadata, ServiceAccountKind } from '~/k8sTypes';
 
 type MockResourceConfigType = {
   name?: string;
@@ -19,3 +19,9 @@ export const mockServiceAccountK8sResource = ({
     creationTimestamp: '2023-02-14T21:43:59Z',
   },
 });
+
+export const ServiceAccountModelTest: K8sModelCommonMetadata = {
+  apiVersion: 'v1',
+  kind: 'ServiceAccount',
+  metadata: { name: 'test-name-sa', namespace: 'test-project', ownerReferences: [] },
+};
diff --git a/frontend/src/__mocks__/mockTrustyAIServiceK8sResource.ts b/frontend/src/__mocks__/mockTrustyAIServiceK8sResource.ts
@@ -68,3 +68,26 @@ export const mockTrustyAIServiceK8sResource = ({
     replicas: 0,
   },
 });
+
+export const TrustyAITest: TrustyAIKind = {
+  apiVersion: 'trustyai.opendatahub.io/v1alpha1',
+  kind: 'TrustyAIService',
+  metadata: {
+    name: 'trustyai-service',
+    namespace: 'test-project',
+  },
+  spec: {
+    storage: {
+      format: 'PVC',
+      folder: '/inputs',
+      size: '1Gi',
+    },
+    data: {
+      filename: 'data.csv',
+      format: 'CSV',
+    },
+    metrics: {
+      schedule: '5s',
+    },
+  },
+};
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/modelMetrics.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/modelMetrics.cy.ts
@@ -16,7 +16,10 @@ import { InferenceServiceKind, ServingRuntimeKind } from '~/k8sTypes';
 import { mockPrometheusServing } from '~/__mocks__/mockPrometheusServing';
 import { mockPrometheusBias } from '~/__mocks__/mockPrometheusBias';
 import { mockMetricsRequest } from '~/__mocks__/mockMetricsRequests';
-import { mockTrustyAIServiceK8sResource } from '~/__mocks__/mockTrustyAIServiceK8sResource';
+import {
+  TrustyAITest,
+  mockTrustyAIServiceK8sResource,
+} from '~/__mocks__/mockTrustyAIServiceK8sResource';
 import { mockRouteK8sResource } from '~/__mocks__/mockRouteK8sResource';
 import { projectDetailsSettingsTab } from '~/__tests__/cypress/cypress/pages/projects';
 import { mockServingRuntimeK8sResource } from '~/__mocks__/mockServingRuntimeK8sResource';
@@ -414,28 +417,7 @@ describe('Model Metrics', () => {
     projectDetailsSettingsTab.findTrustyAIInstallCheckbox().check();
 
     cy.wait('@installTrustyAI').then((interception) => {
-      expect(interception.request.body).to.be.eql({
-        apiVersion: 'trustyai.opendatahub.io/v1alpha1',
-        kind: 'TrustyAIService',
-        metadata: {
-          name: 'trustyai-service',
-          namespace: 'test-project',
-        },
-        spec: {
-          storage: {
-            format: 'PVC',
-            folder: '/inputs',
-            size: '1Gi',
-          },
-          data: {
-            filename: 'data.csv',
-            format: 'CSV',
-          },
-          metrics: {
-            schedule: '5s',
-          },
-        },
-      });
+      expect(interception.request.body).to.be.eql(TrustyAITest);
     });
   });
 

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
@@ -14,7 +14,10 @@ import {
   mockRouteK8sResourceModelServing,
 } from '~/__mocks__/mockRouteK8sResource';
 import { mockSecretK8sResource } from '~/__mocks__/mockSecretK8sResource';
-import { mockServiceAccountK8sResource } from '~/__mocks__/mockServiceAccountK8sResource';
+import {
+  ServiceAccountModelTest,
+  mockServiceAccountK8sResource,
+} from '~/__mocks__/mockServiceAccountK8sResource';
 import {
   mockServingRuntimeK8sResource,
   mockServingRuntimeK8sResourceLegacy,
@@ -1021,11 +1024,7 @@ describe('Serving Runtime List', () => {
       //dry run request
       cy.wait('@createServiceAccount').then((interception) => {
         expect(interception.request.url).to.include('?dryRun=All');
-        expect(interception.request.body).to.eql({
-          apiVersion: 'v1',
-          kind: 'ServiceAccount',
-          metadata: { name: 'test-name-sa', namespace: 'test-project', ownerReferences: [] },
-        });
+        expect(interception.request.body).to.eql(ServiceAccountModelTest);
       });
 
       //Actual request
@@ -1343,11 +1342,7 @@ describe('Serving Runtime List', () => {
       //dry run request
       cy.wait('@createServiceAccount').then((interception) => {
         expect(interception.request.url).to.include('?dryRun=All');
-        expect(interception.request.body).to.eql({
-          apiVersion: 'v1',
-          kind: 'ServiceAccount',
-          metadata: { name: 'test-name-sa', namespace: 'test-project', ownerReferences: [] },
-        });
+        expect(interception.request.body).to.eql(ServiceAccountModelTest);
       });
 
       // Actual request

diff --git a/frontend/src/api/k8s/acceleratorProfiles.ts b/frontend/src/api/k8s/acceleratorProfiles.ts
@@ -1,6 +1,7 @@
 import { k8sGetResource, k8sListResource } from '@openshift/dynamic-plugin-sdk-utils';
 import { AcceleratorProfileKind } from '~/k8sTypes';
 import { AcceleratorProfileModel } from '~/api/models';
+import { TolerationEffect, TolerationOperator } from '~/types';
 
 export const listAcceleratorProfiles = async (
   namespace: string,
@@ -20,3 +21,23 @@ export const getAcceleratorProfile = (
     model: AcceleratorProfileModel,
     queryOptions: { name, ns: namespace },
   });
+
+export const fakeAcceleratorProfile: AcceleratorProfileKind = {
+  apiVersion: 'dashboard.opendatahub.io/v1',
+  kind: 'AcceleratorProfile',
+  metadata: {
+    name: 'migrated-gpu',
+  },
+  spec: {
+    identifier: 'nvidia.com/gpu',
+    displayName: 'NVIDIA GPU',
+    enabled: true,
+    tolerations: [
+      {
+        key: 'nvidia.com/gpu',
+        operator: TolerationOperator.EXISTS,
+        effect: TolerationEffect.NO_SCHEDULE,
+      },
+    ],
+  },
+};
diff --git a/frontend/src/api/k8sUtils.ts b/frontend/src/api/k8sUtils.ts
@@ -3,6 +3,10 @@ import {
   K8sModelCommon,
   K8sResourceCommon,
 } from '@openshift/dynamic-plugin-sdk-utils';
+import { genUID } from '~/__mocks__/mockUtils';
+import { KnownLabels } from '~/k8sTypes';
+import { AwsKeys } from '~/pages/projects/dataConnections/const';
+import { DataConnection } from '~/pages/projects/types';
 
 export const addOwnerReference = <R extends K8sResourceCommon>(
   resource: R,
@@ -40,3 +44,35 @@ export const groupVersionKind = (model: K8sModelCommon): K8sGroupVersionKind =>
   version: model.apiVersion,
   kind: model.kind,
 });
+
+export const dataConnection: DataConnection = {
+  type: 0,
+  data: {
+    kind: 'Secret',
+    apiVersion: 'v1',
+    metadata: {
+      name: 'test-secret',
+      namespace: 'test-project',
+      uid: genUID('secret'),
+      resourceVersion: '5985371',
+      creationTimestamp: '2023-03-22T16:18:56Z',
+      labels: {
+        [KnownLabels.DASHBOARD_RESOURCE]: 'true',
+        [KnownLabels.DATA_CONNECTION_AWS]: 'true',
+      },
+      annotations: {
+        'opendatahub.io/connection-type': 's3',
+        'openshift.io/display-name': 'Test Secret',
+      },
+    },
+    data: {
+      [AwsKeys.NAME]: 'test-secret',
+      AWS_ACCESS_KEY_ID: 'test',
+      AWS_DEFAULT_REGION: 'region',
+      AWS_S3_BUCKET: 'bucket',
+      AWS_S3_ENDPOINT: 'endpoint',
+      AWS_SECRET_ACCESS_KEY: 'test',
+    },
+    type: 'Opaque',
+  },
+};
diff --git a/frontend/src/k8sTypes.ts b/frontend/src/k8sTypes.ts
@@ -1329,3 +1329,13 @@ export type ModelRegistryKind = K8sResourceCommon & {
     conditions?: K8sCondition[];
   };
 };
+
+export type K8sModelCommonMetadata = {
+  apiVersion: string;
+  kind: string;
+  metadata: {
+    name: string;
+    namespace: string;
+    ownerReferences: string[];
+  };
+};
diff --git a/frontend/src/pages/projects/screens/detail/data-connections/__tests__/utils.spec.ts b/frontend/src/pages/projects/screens/detail/data-connections/__tests__/utils.spec.ts
@@ -1,5 +1,4 @@
-import { KnownLabels } from '~/k8sTypes';
-import { DataConnection, DataConnectionType } from '~/pages/projects/types';
+import { DataConnectionType } from '~/pages/projects/types';
 import {
   convertAWSSecretData,
   deleteDataConnection,
@@ -12,50 +11,16 @@ import {
   isSecretAWSSecretKind,
 } from '~/pages/projects/screens/detail/data-connections/utils';
 import { AwsKeys } from '~/pages/projects/dataConnections/const';
-import { deleteSecret } from '~/api';
 import { mockSecretK8sResource } from '~/__mocks__/mockSecretK8sResource';
-
-import { genUID } from '~/__mocks__/mockUtils';
 import { mock200Status, mock404Error } from '~/__mocks__/mockK8sStatus';
+import { dataConnection, deleteSecret } from '~/api';
 
 jest.mock('~/api', () => ({
   deleteSecret: jest.fn(),
 }));
 
 const deletesecretMock = jest.mocked(deleteSecret);
 
-const dataConnection: DataConnection = {
-  type: 0,
-  data: {
-    kind: 'Secret',
-    apiVersion: 'v1',
-    metadata: {
-      name: 'test-secret',
-      namespace: 'test-project',
-      uid: genUID('secret'),
-      resourceVersion: '5985371',
-      creationTimestamp: '2023-03-22T16:18:56Z',
-      labels: {
-        [KnownLabels.DASHBOARD_RESOURCE]: 'true',
-        [KnownLabels.DATA_CONNECTION_AWS]: 'true',
-      },
-      annotations: {
-        'opendatahub.io/connection-type': 's3',
-        'openshift.io/display-name': 'Test Secret',
-      },
-    },
-    data: {
-      [AwsKeys.NAME]: 'test-secret',
-      AWS_ACCESS_KEY_ID: 'test',
-      AWS_DEFAULT_REGION: 'region',
-      AWS_S3_BUCKET: 'bucket',
-      AWS_S3_ENDPOINT: 'endpoint',
-      AWS_SECRET_ACCESS_KEY: 'test',
-    },
-    type: 'Opaque',
-  },
-};
-
 const createDataConnection = (type: DataConnectionType) => ({
   ...dataConnection,
   type,

diff --git a/frontend/src/utilities/__tests__/addTypesToK8sListedResources.spec.ts b/frontend/src/utilities/__tests__/addTypesToK8sListedResources.spec.ts
@@ -1,28 +1,7 @@
 import { K8sResourceCommon } from '@openshift/dynamic-plugin-sdk-utils';
+import { servingRuntimeTemplate } from '~/__mocks__/mockServingRuntimeK8sResource';
 import { addTypesToK8sListedResources } from '~/utilities/addTypesToK8sListedResources';
 
-const servingRuntimeTemplate = {
-  apiVersion: 'template.openshift.io/v1',
-  kind: 'TemplateList',
-  items: [
-    {
-      metadata: {
-        name: 'test-model',
-        annotations: {
-          'openshift.io/display-name': 'New OVMS Server',
-        },
-        labels: {
-          'opendatahub.io/dashboard': 'true',
-        },
-      },
-    },
-  ],
-  metadata: {
-    resourceVersion: '24348645',
-    continue: '',
-  },
-};
-
 describe('addTypesToK8sListedResources', () => {
   it('should have apiVersion and kind as Template', () => {
     const list = addTypesToK8sListedResources(servingRuntimeTemplate, 'Template');

diff --git a/frontend/src/utilities/useAcceleratorProfileState.ts b/frontend/src/utilities/useAcceleratorProfileState.ts
@@ -1,14 +1,9 @@
 import React from 'react';
+import { fakeAcceleratorProfile } from '~/api';
 import { AcceleratorProfileKind } from '~/k8sTypes';
 import useAcceleratorProfiles from '~/pages/notebookController/screens/server/useAcceleratorProfiles';
 import { useDashboardNamespace } from '~/redux/selectors';
-import {
-  ContainerResourceAttributes,
-  ContainerResources,
-  Toleration,
-  TolerationEffect,
-  TolerationOperator,
-} from '~/types';
+import { ContainerResourceAttributes, ContainerResources, Toleration } from '~/types';
 import useGenericObjectState, { GenericObjectState } from '~/utilities/useGenericObjectState';
 import { getAcceleratorProfileCount, isEnumMember } from '~/utilities/utils';
 
@@ -96,27 +91,6 @@ const useAcceleratorProfileState = (
                 setData('additionalOptions', { useDisabled: acceleratorProfile });
               }
             } else {
-              // create a fake accelerator to use
-              const fakeAcceleratorProfile: AcceleratorProfileKind = {
-                apiVersion: 'dashboard.opendatahub.io/v1',
-                kind: 'AcceleratorProfile',
-                metadata: {
-                  name: 'migrated-gpu',
-                },
-                spec: {
-                  identifier: 'nvidia.com/gpu',
-                  displayName: 'NVIDIA GPU',
-                  enabled: true,
-                  tolerations: [
-                    {
-                      key: 'nvidia.com/gpu',
-                      operator: TolerationOperator.EXISTS,
-                      effect: TolerationEffect.NO_SCHEDULE,
-                    },
-                  ],
-                },
-              };
-
               setData('acceleratorProfile', fakeAcceleratorProfile);
               setData('acceleratorProfiles', [fakeAcceleratorProfile, ...acceleratorProfiles]);
               setData('initialAcceleratorProfile', fakeAcceleratorProfile);