Merge pull request opendatahub-io#2940 from rsun19/k8-model-refactor

refactored k8 resources
jenny-s51 · Jun 24, 2024 · 39ec5ca · 39ec5ca
2 parents 9cbc8b3 + f39488f
commit 39ec5ca
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 414 deletions.
diff --git a/frontend/src/api/k8s/__tests__/clusterQueues.spec.ts b/frontend/src/api/k8s/__tests__/clusterQueues.spec.ts
@@ -2,6 +2,7 @@ import { k8sListResourceItems } from '@openshift/dynamic-plugin-sdk-utils';
 import { mockClusterQueueK8sResource } from '~/__mocks__/mockClusterQueueK8sResource';
 import { ClusterQueueKind } from '~/k8sTypes';
 import { listClusterQueues } from '~/api/k8s/clusterQueues';
+import { ClusterQueueModel } from '~/api/models/kueue';
 
 jest.mock('@openshift/dynamic-plugin-sdk-utils', () => ({
   k8sListResourceItems: jest.fn(),
@@ -16,12 +17,7 @@ describe('listClusterQueues', () => {
     k8sListResourceItemsMock.mockResolvedValue([clusterQueueMock]);
     const result = await listClusterQueues();
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: {
-        apiGroup: 'kueue.x-k8s.io',
-        apiVersion: 'v1beta1',
-        kind: 'ClusterQueue',
-        plural: 'clusterqueues',
-      },
+      model: ClusterQueueModel,
       queryOptions: {},
     });
     expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
@@ -33,12 +29,7 @@ describe('listClusterQueues', () => {
     await expect(listClusterQueues()).rejects.toThrow('error1');
     expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: {
-        apiGroup: 'kueue.x-k8s.io',
-        apiVersion: 'v1beta1',
-        kind: 'ClusterQueue',
-        plural: 'clusterqueues',
-      },
+      model: ClusterQueueModel,
       queryOptions: {},
     });
   });

diff --git a/frontend/src/api/k8s/__tests__/configMaps.spec.ts b/frontend/src/api/k8s/__tests__/configMaps.spec.ts
@@ -92,11 +92,7 @@ describe('createConfigMap', () => {
     expect(k8sCreateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: { queryParams: {} },
       resource: configMapMock,
     });
@@ -112,11 +108,7 @@ describe('createConfigMap', () => {
     expect(k8sCreateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: { queryParams: {} },
       resource: configMapMock,
     });
@@ -133,11 +125,7 @@ describe('replaceConfigMap', () => {
     expect(k8sUpdateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sUpdateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: { queryParams: {} },
       resource: configMapMock,
     });
@@ -153,11 +141,7 @@ describe('replaceConfigMap', () => {
     expect(k8sUpdateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sUpdateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: { queryParams: {} },
       resource: configMapMock,
     });
@@ -174,11 +158,7 @@ describe('deleteConfigMap', () => {
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: {
         name: configMapName,
         ns: namespace,
@@ -196,11 +176,7 @@ describe('deleteConfigMap', () => {
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: {
         name: configMapName,
         ns: namespace,
@@ -216,11 +192,7 @@ describe('deleteConfigMap', () => {
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiVersion: 'v1',
-        kind: 'ConfigMap',
-        plural: 'configmaps',
-      },
+      model: ConfigMapModel,
       queryOptions: {
         name: configMapName,
         ns: namespace,

diff --git a/frontend/src/api/k8s/__tests__/inferenceServices.spec.ts b/frontend/src/api/k8s/__tests__/inferenceServices.spec.ts
@@ -328,12 +328,7 @@ describe('listInferenceService', () => {
     expect(k8sListResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sListResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiGroup: 'serving.kserve.io',
-        apiVersion: 'v1beta1',
-        kind: 'InferenceService',
-        plural: 'inferenceservices',
-      },
+      model: InferenceServiceModel,
       queryOptions: { queryParams: {} },
     });
   });
@@ -344,12 +339,7 @@ describe('listInferenceService', () => {
     expect(k8sListResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sListResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: {
-        apiGroup: 'serving.kserve.io',
-        apiVersion: 'v1beta1',
-        kind: 'InferenceService',
-        plural: 'inferenceservices',
-      },
+      model: InferenceServiceModel,
       queryOptions: { queryParams: {} },
     });
   });
@@ -598,12 +588,7 @@ describe('deleteInferenceService', () => {
       fetchOptions: {
         requestInit: {},
       },
-      model: {
-        apiGroup: 'serving.kserve.io',
-        apiVersion: 'v1beta1',
-        kind: 'InferenceService',
-        plural: 'inferenceservices',
-      },
+      model: InferenceServiceModel,
       queryOptions: {
         name: 'test',
         ns: 'test-project',
@@ -622,12 +607,7 @@ describe('deleteInferenceService', () => {
       fetchOptions: {
         requestInit: {},
       },
-      model: {
-        apiGroup: 'serving.kserve.io',
-        apiVersion: 'v1beta1',
-        kind: 'InferenceService',
-        plural: 'inferenceservices',
-      },
+      model: InferenceServiceModel,
       queryOptions: {
         name: 'test',
         ns: 'test-project',
@@ -645,12 +625,7 @@ describe('deleteInferenceService', () => {
       fetchOptions: {
         requestInit: {},
       },
-      model: {
-        apiGroup: 'serving.kserve.io',
-        apiVersion: 'v1beta1',
-        kind: 'InferenceService',
-        plural: 'inferenceservices',
-      },
+      model: InferenceServiceModel,
       queryOptions: {
         name: 'test',
         ns: 'test-project',

diff --git a/frontend/src/api/k8s/__tests__/localQueues.spec.ts b/frontend/src/api/k8s/__tests__/localQueues.spec.ts
@@ -2,6 +2,7 @@ import { k8sListResourceItems } from '@openshift/dynamic-plugin-sdk-utils';
 import { mockLocalQueueK8sResource } from '~/__mocks__/mockLocalQueueK8sResource';
 import { LocalQueueKind } from '~/k8sTypes';
 import { listLocalQueues } from '~/api/k8s/localQueues';
+import { LocalQueueModel } from '~/api/models/kueue';
 
 jest.mock('@openshift/dynamic-plugin-sdk-utils', () => ({
   k8sListResourceItems: jest.fn(),
@@ -19,12 +20,7 @@ describe('listLocalQueues', () => {
     k8sListResourceItemsMock.mockResolvedValue([mockedLocalQueue]);
     const result = await listLocalQueues('test-project');
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: {
-        apiGroup: 'kueue.x-k8s.io',
-        apiVersion: 'v1beta1',
-        kind: 'LocalQueue',
-        plural: 'localqueues',
-      },
+      model: LocalQueueModel,
       queryOptions: { ns: 'test-project' },
     });
     expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
@@ -36,12 +32,7 @@ describe('listLocalQueues', () => {
     await expect(listLocalQueues('test-project')).rejects.toThrow('error1');
     expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: {
-        apiGroup: 'kueue.x-k8s.io',
-        apiVersion: 'v1beta1',
-        kind: 'LocalQueue',
-        plural: 'localqueues',
-      },
+      model: LocalQueueModel,
       queryOptions: { ns: 'test-project' },
     });
   });

diff --git a/frontend/src/api/k8s/__tests__/projects.spec.ts b/frontend/src/api/k8s/__tests__/projects.spec.ts
@@ -17,7 +17,7 @@ import {
   updateProject,
   useProjects,
 } from '~/api/k8s/projects';
-import { ProjectModel } from '~/api/models';
+import { ProjectModel, ProjectRequestModel } from '~/api/models';
 import { ODH_PRODUCT_NAME } from '~/utilities/const';
 import { NamespaceApplicationCase } from '~/pages/projects/types';
 import { ProjectKind } from '~/k8sTypes';
@@ -118,12 +118,6 @@ describe('createProject', () => {
       applied,
     },
   });
-  const projectRequest = {
-    apiGroup: 'project.openshift.io',
-    apiVersion: 'v1',
-    kind: 'ProjectRequest',
-    plural: 'projectrequests',
-  };
 
   it('should create a project when k8s name is given', async () => {
     const projectMock = mockProjectK8sResource({ k8sName });
@@ -133,7 +127,7 @@ describe('createProject', () => {
     expect(result).toStrictEqual(k8sName);
     expect(k8sCreateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
-      model: projectRequest,
+      model: ProjectRequestModel,
       resource: {
         apiVersion: 'project.openshift.io/v1',
         kind: 'ProjectRequest',
@@ -156,7 +150,7 @@ describe('createProject', () => {
     expect(result).toStrictEqual(displayName);
     expect(k8sCreateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
-      model: projectRequest,
+      model: ProjectRequestModel,
       resource: {
         apiVersion: 'project.openshift.io/v1',
         kind: 'ProjectRequest',

diff --git a/frontend/src/api/k8s/__tests__/pvcs.spec.ts b/frontend/src/api/k8s/__tests__/pvcs.spec.ts
@@ -8,6 +8,7 @@ import {
 import { mock200Status, mock404Error } from '~/__mocks__/mockK8sStatus';
 import { mockPVCK8sResource } from '~/__mocks__/mockPVCK8sResource';
 import { assemblePvc, createPvc, deletePvc, getDashboardPvcs, updatePvc } from '~/api/k8s/pvcs';
+import { PVCModel } from '~/api/models/k8s';
 import { PersistentVolumeClaimKind } from '~/k8sTypes';
 import { CreatingStorageObject } from '~/pages/projects/types';
 
@@ -80,7 +81,7 @@ describe('getDashboardPvcs', () => {
     k8sListResourceItemsMock.mockResolvedValue([pvcMock]);
     const result = await getDashboardPvcs('projectName');
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: {
         ns: 'projectName',
         queryParams: { labelSelector: 'opendatahub.io/dashboard=true' },
@@ -94,7 +95,7 @@ describe('getDashboardPvcs', () => {
     await expect(getDashboardPvcs('projectName')).rejects.toThrow('error1');
     expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
     expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: {
         ns: 'projectName',
         queryParams: { labelSelector: 'opendatahub.io/dashboard=true' },
@@ -109,7 +110,7 @@ describe('createPvc', () => {
     const result = await createPvc(data, 'namespace');
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { queryParams: {} },
       resource: createAssemblePvcs(['ReadWriteOnce']),
     });
@@ -122,7 +123,7 @@ describe('createPvc', () => {
     await expect(createPvc(data, 'namespace')).rejects.toThrow('error1');
     expect(k8sCreateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { queryParams: {} },
       resource: createAssemblePvcs(['ReadWriteOnce']),
     });
@@ -136,7 +137,7 @@ describe('updatePvc', () => {
     const result = await updatePvc(data, assemblePvcResult, 'namespace');
     expect(k8sUpdateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { queryParams: {} },
       resource: createAssemblePvcs(['ReadWriteOnce']),
     });
@@ -150,7 +151,7 @@ describe('updatePvc', () => {
     expect(k8sUpdateResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sUpdateResourceMock).toHaveBeenCalledWith({
       fetchOptions: { requestInit: {} },
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { queryParams: {} },
       resource: createAssemblePvcs(['ReadWriteOnce']),
     });
@@ -163,7 +164,7 @@ describe('deletePvc', () => {
     k8sDeleteResourceMock.mockResolvedValue(mockK8sStatus);
     const result = await deletePvc('pvcName', 'namespace');
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { name: 'pvcName', ns: 'namespace' },
     });
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
@@ -175,7 +176,7 @@ describe('deletePvc', () => {
     k8sDeleteResourceMock.mockResolvedValue(mockK8sStatus);
     const result = await deletePvc('pvcName', 'namespace');
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { name: 'pvcName', ns: 'namespace' },
     });
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
@@ -187,7 +188,7 @@ describe('deletePvc', () => {
     await expect(deletePvc('pvcName', 'namespace')).rejects.toThrow('error1');
     expect(k8sDeleteResourceMock).toHaveBeenCalledTimes(1);
     expect(k8sDeleteResourceMock).toHaveBeenCalledWith({
-      model: { apiVersion: 'v1', kind: 'PersistentVolumeClaim', plural: 'persistentvolumeclaims' },
+      model: PVCModel,
       queryOptions: { name: 'pvcName', ns: 'namespace' },
     });
   });