Merge pull request #2448 from opendatahub-io/f/pipelines-v2

[RHOAIENG-331] Pipelines v2 API Parity

backend/src/types.ts

@@ -33,6 +33,7 @@ export type DashboardConfig = K8sResourceCommon & {
       disableKServe: boolean;
       disableModelMesh: boolean;
       disableAcceleratorProfiles: boolean;
+      disablePipelineExperiments: boolean;
     };
     groupsConfig?: {
       adminGroups: string;
@@ -53,12 +54,6 @@ export type DashboardConfig = K8sResourceCommon & {
     templateOrder?: string[];
     templateDisablement?: string[];
   };
-  /** Faux status object -- will be replaced in the long run by a Dashboard Controller */
-  status: {
-    dependencyOperators: {
-      redhatOpenshiftPipelines: OperatorStatus;
-    };
-  };
 };
 
 export type ModelServerSize = {

backend/src/utils/constants.ts

@@ -58,6 +58,7 @@ export const blankDashboardCR: DashboardConfig = {
       disableKServe: false,
       disableModelMesh: false,
       disableAcceleratorProfiles: false,
+      disablePipelineExperiments: true,
     },
     notebookController: {
       enabled: true,
@@ -69,14 +70,6 @@ export const blankDashboardCR: DashboardConfig = {
     templateOrder: [],
     // templateDisablement: [], Don't create this field, will be used in migration
   },
-  status: {
-    dependencyOperators: {
-      redhatOpenshiftPipelines: {
-        available: false,
-        queriedForStatus: false,
-      },
-    },
-  },
 };
 
 export const MOUNT_PATH = '/opt/app-root/src';

backend/src/utils/resourceUtils.ts

@@ -56,36 +56,10 @@ let buildsWatcher: ResourceWatcher<BuildStatus>;
 let consoleLinksWatcher: ResourceWatcher<ConsoleLinkKind>;
 let quickStartWatcher: ResourceWatcher<QuickStart>;
 
-const fetchOperatorExistence = async (
-  fastify: KubeFastifyInstance,
-  operatorNamePrefix: string,
-): Promise<boolean> => {
-  const operators: K8sResourceCommon[] = await fastify.kube.customObjectsApi
-    .listNamespacedCustomObject(
-      'operators.coreos.com',
-      'v1alpha1',
-      'openshift-operators',
-      'clusterserviceversions',
-    )
-    .then((resp) => {
-      const listObj = resp.body as K8sResourceCommon & { items?: K8sResourceCommon[] };
-
-      return listObj.items ?? [];
-    })
-    .catch((e) => {
-      fastify.log.warn(`Received error (${e.body.message}) fetching operators.`);
-      return [];
-    });
-
-  return !!operators.find((o) => o.metadata.name.startsWith(operatorNamePrefix));
-};
-
 const fetchDashboardCR = async (fastify: KubeFastifyInstance): Promise<DashboardConfig[]> => {
   const dashboardName = process.env['DASHBOARD_CONFIG'] || dashboardConfigMapName;
   return fetchOrCreateDashboardCR(fastify, dashboardName).then((dashboardCR) => {
-    return manageOperatorStatus(fastify, dashboardCR).then((dashboardCR) => {
-      return migrateTemplateDisablement(fastify, dashboardCR).then((dashboardCR) => [dashboardCR]);
-    });
+    return migrateTemplateDisablement(fastify, dashboardCR).then((dashboardCR) => [dashboardCR]);
   });
 };
 
@@ -128,31 +102,6 @@ const fetchOrCreateDashboardCR = async (
     });
 };
 
-const manageOperatorStatus = async (
-  fastify: KubeFastifyInstance,
-  dashboardConfig: DashboardConfig,
-): Promise<DashboardConfig> => {
-  if (dashboardConfig.spec.dashboardConfig.disablePipelines === false) {
-    fastify.log.info('Pipelines feature enabled, computing operator state...');
-    return fetchOperatorExistence(fastify, 'openshift-pipelines-operator-rh').then((exists) => {
-      fastify.log.info(`Pipeline Operator status: ${exists}`);
-      return _.merge({}, dashboardConfig, {
-        status: {
-          ...dashboardConfig.status,
-          dependencyOperators: {
-            redhatOpenshiftPipelines: {
-              queriedForStatus: true,
-              available: exists,
-            },
-          },
-        },
-      });
-    });
-  }
-
-  return dashboardConfig;
-};
-
 const createDashboardCR = (fastify: KubeFastifyInstance): Promise<DashboardConfig> => {
   return fastify.kube.customObjectsApi
     .createNamespacedCustomObject(

docs/dashboard-config.md

@@ -56,6 +56,7 @@ spec:
     modelMetricsNamespace: ''
     disableBiasMetrics: false
     disablePerformanceMetrics: false
+    disablePipelineExperiments: false
 ```
 
 ## Additional fields
@@ -148,6 +149,7 @@ spec:
     modelMetricsNamespace: ''
     disableBiasMetrics: false
     disablePerformanceMetrics: false
+    disablePipelineExperiments: true
   notebookController:
     enabled: true
     gpuSetting: autodetect

frontend/src/__mocks__/index.ts

@@ -0,0 +1,15 @@
+export * from './mockDashboardConfig';
+export * from './mockDataSciencePipelinesApplicationK8sResource';
+export * from './mockK8sResourceList';
+export * from './mockProjectK8sResource';
+export * from './mockRouteK8sResource';
+export * from './mockStatus';
+export * from './mockRunKF';
+export * from './mockJobKF';
+export * from './mockExperimentKF';
+export * from './mockPipelineVersionsProxy';
+export * from './mockPipelinesProxy';
+export * from './mockDscStatus';
+export * from './mockNotebookK8sResource';
+export * from './mockPipelineKF';
+export * from './mockSecretK8sResource';

frontend/src/__mocks__/mockDashboardConfig.ts

@@ -18,6 +18,7 @@ type MockDashboardConfigType = {
   disableAcceleratorProfiles?: boolean;
   disablePerformanceMetrics?: boolean;
   disableBiasMetrics?: boolean;
+  disablePipelineExperiments?: boolean;
   disableDistributedWorkloads?: boolean;
 };
 
@@ -39,6 +40,7 @@ export const mockDashboardConfig = ({
   disableAcceleratorProfiles = false,
   disablePerformanceMetrics = false,
   disableBiasMetrics = false,
+  disablePipelineExperiments = true,
   disableDistributedWorkloads = false,
 }: MockDashboardConfigType): DashboardConfigKind => ({
   apiVersion: 'opendatahub.io/v1alpha',
@@ -71,6 +73,7 @@ export const mockDashboardConfig = ({
       disableKServe,
       disableModelMesh,
       disableAcceleratorProfiles,
+      disablePipelineExperiments,
       disableDistributedWorkloads,
     },
     notebookController: {
@@ -197,12 +200,4 @@ export const mockDashboardConfig = ({
     templateOrder: ['test-model'],
     templateDisablement: ['test-model'],
   },
-  status: {
-    dependencyOperators: {
-      redhatOpenshiftPipelines: {
-        available: !disablePipelines,
-        queriedForStatus: false,
-      },
-    },
-  },
 });

frontend/src/__mocks__/mockDataConnection.ts

@@ -37,11 +37,11 @@ export const mockDataConnection = ({
     },
     data: {
       [AwsKeys.NAME]: name,
-      AWS_ACCESS_KEY_ID: 'c2RzZA==',
-      AWS_DEFAULT_REGION: 'us-east-1',
-      AWS_S3_BUCKET: s3Bucket,
-      AWS_S3_ENDPOINT: 'http://aws.com',
-      AWS_SECRET_ACCESS_KEY: 'aHR0cHM6Ly9zMy5hbWF6b25hd3MuY29tLw==',
+      [AwsKeys.ACCESS_KEY_ID]: 'c2RzZA==',
+      [AwsKeys.DEFAULT_REGION]: 'us-east-1',
+      [AwsKeys.AWS_S3_BUCKET]: s3Bucket,
+      [AwsKeys.S3_ENDPOINT]: 'http://aws.com',
+      [AwsKeys.SECRET_ACCESS_KEY]: 'aHR0cHM6Ly9zMy5hbWF6b25hd3MuY29tLw==',
     },
     type: 'Opaque',
   },

frontend/src/__mocks__/mockDataSciencePipelinesApplicationK8sResource.ts

@@ -1,25 +1,27 @@
 import { DSPipelineKind } from '~/k8sTypes';
 
 type MockResourceConfigType = {
-  name?: string;
   namespace?: string;
+  dspVersion?: string;
   displayName?: string;
   initializing?: boolean;
   dspaSecretName?: string;
 };
 
 export const mockDataSciencePipelineApplicationK8sResource = ({
   namespace = 'test-project',
+  dspVersion = 'v2',
   initializing = false,
   dspaSecretName = 'aws-connection-testdb',
 }: MockResourceConfigType): DSPipelineKind => ({
   apiVersion: 'datasciencepipelinesapplications.opendatahub.io/v1alpha1',
   kind: 'DataSciencePipelinesApplication',
   metadata: {
-    name: 'pipelines-definition',
+    name: 'dspa',
     namespace,
   },
   spec: {
+    dspVersion,
     apiServer: {
       enableSamplePipeline: false,
     },
@@ -31,6 +33,7 @@ export const mockDataSciencePipelineApplicationK8sResource = ({
     },
     objectStorage: {
       externalStorage: {
+        region: 'us-east-2',
         bucket: 'test-pipelines-bucket',
         host: 's3.amazonaws.com',
         port: '',

frontend/src/__mocks__/mockExperimentKF.ts

@@ -0,0 +1,25 @@
+/* eslint-disable camelcase */
+import { ExperimentKFv2, StorageStateKF } from '~/concepts/pipelines/kfTypes';
+
+export const buildMockExperimentKF = (experiment?: Partial<ExperimentKFv2>): ExperimentKFv2 => ({
+  experiment_id: 'a9947051-ead5-480c-acca-fd26ae14b81b',
+  display_name: 'Default',
+  description: 'All runs created without specifying an experiment will be grouped here.',
+  created_at: '2024-01-31T15:46:33Z',
+  storage_state: StorageStateKF.AVAILABLE,
+  ...experiment,
+});
+
+export const buildMockExperiments = (
+  experiments: ExperimentKFv2[] = [buildMockExperimentKF()],
+  totalSize?: number,
+  nextPageToken?: string,
+): {
+  total_size?: number | undefined;
+  next_page_token?: string | undefined;
+  experiments: ExperimentKFv2[];
+} => ({
+  experiments,
+  total_size: totalSize || experiments.length,
+  next_page_token: nextPageToken,
+});

frontend/src/__mocks__/mockPipelineKF.ts

@@ -1,11 +1,19 @@
 /* eslint-disable camelcase */
-import { PipelineKF, RelationshipKF, ResourceTypeKF } from '~/concepts/pipelines/kfTypes';
+import {
+  PipelineKF,
+  PipelineKFv2,
+  RelationshipKF,
+  ResourceTypeKF,
+} from '~/concepts/pipelines/kfTypes';
 
 type MockResourceConfigType = {
   name?: string;
   id?: string;
 };
 
+/**
+ * @deprecated use buildMockPipelineV2 instead
+ */
 export const mockPipelineKF = ({
   name = 'test-pipeline',
   id = 'test-pipeline',
@@ -30,3 +38,14 @@ export const mockPipelineKF = ({
     ],
   },
 });
+
+export const mockPipelineKFv2 = ({
+  name = 'test-pipeline',
+  id = 'test-pipeline',
+}: MockResourceConfigType): PipelineKFv2 => ({
+  pipeline_id: id,
+  created_at: '2023-11-23T17:16:37Z',
+  display_name: name,
+  description:
+    '[source code](https://github.com/opendatahub-io/data-science-pipelines/tree/master/samples/flip-coin) A conditional pipeline to flip coins based on a random number generator.',
+});