add tensorboard routing rule (#143)

* add tensorboard routing rule * rename tb routing rule * address comments * remove debugger * fix url prefix
kubeflow · Nov 8, 2018 · c2c3136 · c2c3136
1 parent 26381f3
commit c2c3136
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/frontend/server/proxy-middleware.ts b/frontend/server/proxy-middleware.ts
@@ -32,7 +32,7 @@ export function _routePathWithReferer(proxyPrefix: string, path: string, referer
   // just trim out the /_proxy/ prefix. Use the origin of the resulting URL.
   const proxiedUrlInReferer = _extractUrlFromReferer(proxyPrefix, referer);
   let decodedPath =
-      decodeURIComponent(proxiedUrlInReferer || _trimProxyPrefix(proxyPrefix, path));
+    decodeURIComponent(proxiedUrlInReferer || _trimProxyPrefix(proxyPrefix, path));
   if (!decodedPath.startsWith('http://') && !decodedPath.startsWith('https://')) {
     decodedPath = 'http://' + decodedPath;
   }
@@ -57,8 +57,11 @@ export default (app: express.Application, apisPrefix: string) => {
     if (req.headers.referer) {
       const refererUrl = _extractUrlFromReferer(proxyPrefix, req.headers.referer as string);
       if (refererUrl && req.url.indexOf(proxyPrefix) !== 0) {
-        const proxiedUrl = decodeURIComponent(
-            _extractUrlFromReferer(proxyPrefix, req.headers.referer as string));
+        let proxiedUrl = decodeURIComponent(
+          _extractUrlFromReferer(proxyPrefix, req.headers.referer as string));
+        if (!proxiedUrl.startsWith('http://') && !proxiedUrl.startsWith('https://')) {
+          proxiedUrl = 'http://' + proxiedUrl;
+        }
         const proxiedOrigin = new URL(proxiedUrl).origin;
         req.url = proxyPrefix + encodeURIComponent(proxiedOrigin + req.url);
       }

diff --git a/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet b/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet
@@ -2,6 +2,7 @@
   all(namespace, ui_image):: [
     $.parts(namespace).serviceAccount,
     $.parts(namespace).serviceUi,
+    $.parts(namespace).tensorboardData,
     $.parts(namespace).roleBinding,
     $.parts(namespace).role,
     $.parts(namespace).deployUi(ui_image),
@@ -56,6 +57,46 @@
       },
     }, //serviceUi
 
+    tensorboardData: {
+      apiVersion: "v1",
+      kind: "Service",
+      metadata: {
+        labels: {
+          app: "ml-pipeline-tensorboard-ui",
+        },
+        name: "ml-pipeline-tensorboard-ui",
+        namespace: namespace,
+        annotations: {
+          "getambassador.io/config":
+            std.join("\n", [
+              "---",
+              "apiVersion: ambassador/v0",
+              "kind:  Mapping",
+              "name: pipeline-tensorboard-ui-mapping",
+              "prefix: /data",
+              "rewrite: /data",
+              "timeout_ms: 300000",
+              "service: ml-pipeline-ui." + namespace,
+              "use_websocket: true",
+            ]),
+        },  //annotations
+      },
+      spec: {
+        ports: [
+          {
+            port: 80,
+            targetPort: 3000,
+          },
+        ],
+        selector: {
+          app: "ml-pipeline-tensorboard-ui",
+        },
+      },
+      status: {
+        loadBalancer: {}
+      },
+    }, //tensorboardData
+
     roleBinding:: {
       apiVersion: "rbac.authorization.k8s.io/v1beta1",
       kind: "RoleBinding",