Catchup Incubation

backend/src/routes/api/notebooks/utils.ts

@@ -73,8 +73,8 @@ export const enableNotebook = async (
   const url = request.headers.origin;
 
   try {
-    await getNotebook(fastify, notebookNamespace, name);
-    return await updateNotebook(fastify, username, url, notebookData);
+    const notebook = await getNotebook(fastify, notebookNamespace, name);
+    return await updateNotebook(fastify, username, url, notebookData, notebook);
   } catch (e) {
     if (e.response?.statusCode === 404) {
       return await createNotebook(fastify, username, url, notebookData);

backend/src/routes/api/service/modelregistry/index.ts

@@ -4,31 +4,29 @@ import { DEV_MODE } from '../../../../utils/constants';
 import { getParam, setParam } from '../../../../utils/proxy';
 
 export default async (fastify: KubeFastifyInstance): Promise<void> => {
-  if (DEV_MODE) {
-    fastify.register(httpProxy, {
-      upstream: '',
-      prefix: '/:name',
-      rewritePrefix: '',
-      replyOptions: {
-        // preHandler must set the `upstream` param
-        getUpstream: (request) => getParam(request, 'upstream'),
-      },
-      preHandler: (request, _, done) => {
-        const name = getParam(request, 'name');
+  fastify.register(httpProxy, {
+    upstream: '',
+    prefix: '/:name',
+    rewritePrefix: '',
+    replyOptions: {
+      // preHandler must set the `upstream` param
+      getUpstream: (request) => getParam(request, 'upstream'),
+    },
+    preHandler: (request, _, done) => {
+      const name = getParam(request, 'name');
 
-        const upstream = DEV_MODE
-          ? // Use port forwarding for local development:
-            // kubectl port-forward -n <namespace> svc/<service-name> <local.port>:<service.port>
-            `http://${process.env.MODEL_REGISTRY_SERVICE_HOST}:${process.env.MODEL_REGISTRY_SERVICE_PORT}`
-          : // Construct service URL
-            `http://${name}.odh-model-registries.svc.cluster.local:8080`;
+      const upstream = DEV_MODE
+        ? // Use port forwarding for local development:
+          // kubectl port-forward -n <namespace> svc/<service-name> <local.port>:<service.port>
+          `http://${process.env.MODEL_REGISTRY_SERVICE_HOST}:${process.env.MODEL_REGISTRY_SERVICE_PORT}`
+        : // Construct service URL
+          `http://${name}.odh-model-registries.svc.cluster.local:8080`;
 
-        // assign the `upstream` param so we can dynamically set the upstream URL for http-proxy
-        setParam(request, 'upstream', upstream);
+      // assign the `upstream` param so we can dynamically set the upstream URL for http-proxy
+      setParam(request, 'upstream', upstream);
 
-        fastify.log.info(`Proxy ${request.method} request ${request.url} to ${upstream}`);
-        done();
-      },
-    });
-  }
+      fastify.log.info(`Proxy ${request.method} request ${request.url} to ${upstream}`);
+      done();
+    },
+  });
 };

backend/src/utils/notebookUtils.ts

@@ -1,4 +1,5 @@
 import { getDashboardConfig } from './resourceUtils';
+import { merge } from 'lodash';
 import {
   ContainerResourceAttributes,
   EnvironmentVariable,
@@ -510,6 +511,7 @@ export const updateNotebook = async (
   username: string,
   url: string,
   notebookData: NotebookData,
+  oldNotebook: Notebook,
 ): Promise<Notebook> => {
   if (!notebookData) {
     const error = createCustomError(
@@ -521,7 +523,29 @@ export const updateNotebook = async (
     throw error;
   }
   try {
-    const notebookAssembled = await generateNotebookResources(fastify, username, url, notebookData);
+    const serverNotebook = await generateNotebookResources(fastify, username, url, notebookData);
+
+    // Fix for Workbench Certs that get overridden
+    // We are intentionally applying on some details as to avoid implementing logic to properly
+    // manage the notebook the same way as workbench
+    const importantOldNotebookDetails: RecursivePartial<Notebook> = {
+      spec: {
+        template: {
+          spec: {
+            containers: [
+              {
+                env: oldNotebook.spec.template.spec.containers[0].env,
+                volumeMounts: oldNotebook.spec.template.spec.containers[0].volumeMounts,
+              },
+            ],
+            volumes: oldNotebook.spec.template.spec.volumes,
+          },
+        },
+      },
+    };
+
+    const notebookAssembled = merge({}, importantOldNotebookDetails, serverNotebook);
+
     const response = await fastify.kube.customObjectsApi.patchNamespacedCustomObject(
       'kubeflow.org',
       'v1',

frontend/config/webpack.dev.js

@@ -1,3 +1,4 @@
+const { execSync } = require('child_process');
 const path = require('path');
 const { merge } = require('webpack-merge');
 const { setupWebpackDotenvFilesForEnv, setupDotenvFilesForEnv } = require('./dotenv');
@@ -35,13 +36,68 @@ module.exports = merge(
       historyApiFallback: true,
       hot: true,
       open: false,
-      proxy: {
-        '/api': `http://0.0.0.0:${BACKEND_PORT}`,
-        '/wss': {
-          target: `ws://0.0.0.0:${BACKEND_PORT}`,
-          ws: true,
-        },
-      },
+      proxy: (() => {
+        if (process.env.EXT_CLUSTER) {
+          const odhProject = process.env.OC_PROJECT || 'opendatahub';
+          const app = process.env.ODH_APP || 'odh-dashboard';
+          console.info('Using project:', odhProject);
+
+          let dashboardHost;
+          let token;
+          try {
+            try {
+              dashboardHost = execSync(
+                `oc get routes -n ${odhProject} ${app} -o jsonpath='{.spec.host}'`,
+              )
+                .toString()
+                .trim();
+            } catch (e) {
+              console.info('Failed to GET dashboard route, constructing host manually.');
+              dashboardHost = new URL(execSync(`oc whoami --show-server`).toString()).host
+                .replace(/:\d+$/, '')
+                .replace(/^api./, `${app}-${odhProject}.apps.`);
+            }
+            console.info('Dashboard host:', dashboardHost);
+
+            token = execSync('oc whoami --show-token').toString().trim();
+
+            const username = execSync('oc whoami').toString().trim();
+            console.info('Logged in as user:', username);
+          } catch (e) {
+            console.error('Login with `oc login` prior to starting dev server.');
+            process.exit(1);
+          }
+
+          const headers = {
+            Authorization: `Bearer ${token}`,
+            'x-forwarded-access-token': token,
+          };
+
+          return {
+            '/api': {
+              target: `https://${dashboardHost}`,
+              secure: false,
+              changeOrigin: true,
+              headers,
+            },
+            '/wss': {
+              target: `wss://${dashboardHost}`,
+              ws: true,
+              secure: false,
+              changeOrigin: true,
+              headers,
+            },
+          };
+        } else {
+          return {
+            '/api': `http://0.0.0.0:${BACKEND_PORT}`,
+            '/wss': {
+              target: `ws://0.0.0.0:${BACKEND_PORT}`,
+              ws: true,
+            },
+          };
+        }
+      })(),
       devMiddleware: {
         stats: 'errors-only',
       },

frontend/package.json

@@ -26,6 +26,7 @@
     "format": "prettier --write \"./**/*.ts\" \"./**/*.tsx\" \"./**/*.scss\"",
     "lint:goal": "eslint --config ./.eslintrc.goal.js --ext .json,.js,.ts,.jsx,.tsx ./src ",
     "start:dev": "webpack serve --hot --color --config ./config/webpack.dev.js",
+    "start:dev:ext": "EXT_CLUSTER=true npm run start:dev",
     "test": "run-s test:lint test:type-check test:unit test:cypress-ci",
     "test:fix": "eslint --ext .js,.ts,.jsx,.tsx ./src --fix",
     "test:lint": "eslint --max-warnings 0 --ext .js,.ts,.jsx,.tsx ./src",
@@ -62,7 +63,7 @@
     "@patternfly/react-styles": "^5.2.1",
     "@patternfly/react-table": "^5.2.1",
     "@patternfly/react-tokens": "^5.2.1",
-    "@patternfly/react-topology": "^5.3.0-prerelease.5",
+    "@patternfly/react-topology": "^5.3.0-prerelease.12",
     "@patternfly/react-virtualized-extension": "^5.0.0",
     "@types/classnames": "^2.3.1",
     "axios": "^1.6.4",

frontend/src/__mocks__/mockAllowedUsers.ts

@@ -0,0 +1,14 @@
+import { AllowedUser, PrivilegeState } from '~/pages/notebookController/screens/admin/types';
+
+type MockAllowedUsersType = {
+  username?: string;
+  privilege?: PrivilegeState;
+};
+export const mockAllowedUsers = ({
+  username = 'test-user',
+  privilege = PrivilegeState.USER,
+}: MockAllowedUsersType): AllowedUser => ({
+  username,
+  privilege,
+  lastActivity: '2024-02-14T14:22:05Z',
+});

frontend/src/__mocks__/mockDWUsageByOwnerPrometheusResponse.ts

@@ -0,0 +1,16 @@
+import { WorkloadMetricIndexedByOwner, WorkloadMetricPromQueryResponse } from '~/api';
+import { WorkloadOwnerType } from '~/k8sTypes';
+import { mockPrometheusQueryVectorResponse } from './mockPrometheusQueryVectorResponse';
+
+export const mockDWUsageByOwnerPrometheusResponse = (
+  usageByOwner: WorkloadMetricIndexedByOwner,
+): WorkloadMetricPromQueryResponse =>
+  mockPrometheusQueryVectorResponse({
+    result: Object.values(WorkloadOwnerType).flatMap((ownerKind) =>
+      Object.keys(usageByOwner[ownerKind]).map((ownerName) => ({
+        // eslint-disable-next-line camelcase
+        metric: { owner_kind: ownerKind, owner_name: ownerName },
+        value: [0, String(usageByOwner[ownerKind][ownerName])],
+      })),
+    ),
+  });

frontend/src/__mocks__/mockDashboardConfig.ts

@@ -23,6 +23,7 @@ type MockDashboardConfigType = {
   disablePipelineExperiments?: boolean;
   disableDistributedWorkloads?: boolean;
   disableModelRegistry?: boolean;
+  disableNotebookController?: boolean;
 };
 
 export const mockDashboardConfig = ({
@@ -48,6 +49,7 @@ export const mockDashboardConfig = ({
   disablePipelineExperiments = true,
   disableDistributedWorkloads = false,
   disableModelRegistry = true,
+  disableNotebookController = false,
 }: MockDashboardConfigType): DashboardConfigKind => ({
   apiVersion: 'opendatahub.io/v1alpha',
   kind: 'OdhDashboardConfig',
@@ -86,7 +88,7 @@ export const mockDashboardConfig = ({
       disableModelRegistry,
     },
     notebookController: {
-      enabled: true,
+      enabled: !disableNotebookController,
       notebookNamespace: 'openshift-ai-notebooks',
       notebookTolerationSettings: {
         enabled: true,

frontend/src/__mocks__/mockGroupConfig.ts

@@ -0,0 +1,33 @@
+import { GroupsConfig } from '~/pages/groupSettings/groupTypes';
+
+export const mockGroupSettings = (): GroupsConfig => ({
+  adminGroups: [
+    {
+      id: 0,
+      name: 'odh-admins',
+      enabled: true,
+    },
+    {
+      id: 1,
+      name: 'odh-admins-1',
+      enabled: false,
+    },
+  ],
+  allowedGroups: [
+    {
+      id: 0,
+      name: 'odh-admins',
+      enabled: false,
+    },
+    {
+      id: 1,
+      name: 'odh-admins-1',
+      enabled: false,
+    },
+    {
+      id: 2,
+      name: 'system:authenticated',
+      enabled: true,
+    },
+  ],
+});

frontend/src/__mocks__/mockInferenceServiceK8sResource.ts

@@ -1,6 +1,7 @@
 import { K8sStatus } from '@openshift/dynamic-plugin-sdk-utils';
 import { InferenceServiceKind, KnownLabels } from '~/k8sTypes';
 import { genUID } from '~/__mocks__/mockUtils';
+import { ContainerResources } from '~/types';
 
 type MockResourceConfigType = {
   name?: string;
@@ -17,6 +18,7 @@ type MockResourceConfigType = {
   minReplicas?: number;
   maxReplicas?: number;
   lastFailureInfoMessage?: string;
+  resources?: ContainerResources;
 };
 
 type InferenceServicek8sError = K8sStatus & {
@@ -66,11 +68,12 @@ export const mockInferenceServiceK8sResource = ({
   isModelMesh = false,
   activeModelState = 'Pending',
   url = '',
-  path = 'path/to/model',
   acceleratorIdentifier = '',
+  path = 'path/to/model',
   minReplicas = 1,
   maxReplicas = 1,
   lastFailureInfoMessage = 'Waiting for runtime Pod to become available',
+  resources,
 }: MockResourceConfigType): InferenceServiceKind => ({
   apiVersion: 'serving.kserve.io/v1beta1',
   kind: 'InferenceService',
@@ -118,6 +121,7 @@ export const mockInferenceServiceK8sResource = ({
               },
             }
           : {}),
+        ...(resources && { resources }),
         runtime: modelName,
         storage: {
           key: secretName,

frontend/src/__mocks__/mockInferenceServiceModalData.ts

@@ -24,6 +24,19 @@ export const mockInferenceServiceModalData = ({
   externalRoute = false,
   tokenAuth = false,
   tokens = [],
+  modelSize = {
+    name: 'Small',
+    resources: {
+      requests: {
+        cpu: '1',
+        memory: '1Gi',
+      },
+      limits: {
+        cpu: '2',
+        memory: '2Gi',
+      },
+    },
+  },
 }: MockResourceConfigType): CreatingInferenceServiceObject => ({
   name,
   project,
@@ -35,4 +48,5 @@ export const mockInferenceServiceModalData = ({
   externalRoute,
   tokenAuth,
   tokens,
+  modelSize,
 });