Update mlmd and pipelines service to use constructUrl for URL generation

Gkrumbach07 · Sep 9, 2024 · 0740170 · 0740170
1 parent d89ab8d
commit 0740170
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/backend/src/routes/api/service/mlmd/index.ts b/backend/src/routes/api/service/mlmd/index.ts
@@ -9,8 +9,7 @@ export default proxyService<DSPipelineKind>(
     plural: 'datasciencepipelinesapplications',
   },
   {
-    port: 8443,
-    prefix: 'ds-pipeline-md-',
+    constructUrl: (resource) => resource.status.components.mlmdProxy.url,
   },
   {
     // Use port forwarding for local development:

diff --git a/backend/src/routes/api/service/pipelines/index.ts b/backend/src/routes/api/service/pipelines/index.ts
@@ -9,8 +9,7 @@ export default proxyService<DSPipelineKind>(
     plural: 'datasciencepipelinesapplications',
   },
   {
-    port: 8443,
-    prefix: 'ds-pipeline-',
+    constructUrl: (resource) => resource.status.components.apiServer.url,
   },
   {
     // Use port forwarding for local development:

diff --git a/backend/src/types.ts b/backend/src/types.ts
@@ -1145,6 +1145,16 @@ export type DSPipelineKind = K8sResourceCommon & {
   };
   status?: {
     conditions?: K8sCondition[];
+    components: {
+      apiServer: {
+        externalUrl: string;
+        url: string;
+      };
+      mlmdProxy: {
+        externalUrl: string;
+        url: string;
+      };
+    };
   };
 };
 

diff --git a/backend/src/utils/proxy.ts b/backend/src/utils/proxy.ts
@@ -5,6 +5,7 @@ import { isK8sStatus, passThroughResource } from '../routes/api/k8s/pass-through
 import { DEV_MODE } from './constants';
 import { createCustomError } from './requestUtils';
 import { getAccessToken, getDirectCallOptions } from './directCallUtils';
+import { EitherNotBoth } from '../typeHelpers';
 
 export const getParam = <F extends FastifyRequest<any, any>>(req: F, name: string): string =>
   (req.params as { [key: string]: string })[name];
@@ -25,16 +26,20 @@ const notFoundError = (kind: string, name: string, e?: any, overrideMessage?: st
     404,
   );
 };
-
 export const proxyService =
   <K extends K8sResourceCommon = never>(
     model: { apiGroup: string; apiVersion: string; plural: string; kind: string } | null,
-    service: {
-      port: number | string;
-      prefix?: string;
-      suffix?: string;
-      namespace?: string;
-    },
+    service: EitherNotBoth<
+      {
+        port: number | string;
+        prefix?: string;
+        suffix?: string;
+        namespace?: string;
+      },
+      {
+        constructUrl: (resource: K) => string;
+      }
+    >,
     local: {
       host: string;
       port: number | string;
@@ -70,15 +75,17 @@ export const proxyService =
         const namespace = service.namespace ?? getParam(request, 'namespace');
         const name = getParam(request, 'name');
 
-        const doServiceRequest = () => {
+        const doServiceRequest = (resource?: K) => {
           const scheme = tls ? 'https' : 'http';
 
           const upstream = DEV_MODE
             ? // Use port forwarding for local development:
               // kubectl port-forward -n <namespace> svc/<service-name> <local.port>:<service.port>
               `${scheme}://${local.host}:${local.port}`
             : // Construct service URL
-              `${scheme}://${service.prefix || ''}${name}${
+            service.constructUrl
+            ? service.constructUrl(resource)
+            : `${scheme}://${service.prefix || ''}${name}${
                 service.suffix ?? ''
               }.${namespace}.svc.cluster.local:${service.port}`;
 
@@ -108,7 +115,7 @@ export const proxyService =
                     request.headers.authorization = `Bearer ${token}`;
                   }
 
-                  doServiceRequest();
+                  doServiceRequest(resource);
                 } else {
                   done(notFoundError(model.kind, name, undefined, 'service unavailable'));
                 }