From a3de5b8bf31cc3985b404537c96351b5a59b300e Mon Sep 17 00:00:00 2001
From: Hung-Ting Wen <gabrielwen@google.com>
Date: Mon, 6 May 2019 14:31:42 -0700
Subject: [PATCH] Pipeline UI ISTIO manifests (#43)

* updates

* link

* updates

* add params

* add resource
---
 pipeline/pipelines-ui/base/kustomization.yaml | 12 +++++++++++
 pipeline/pipelines-ui/base/params.env         |  1 +
 pipeline/pipelines-ui/base/params.yaml        |  2 ++
 .../pipelines-ui/base/virtual-service.yaml    | 21 +++++++++++++++++++
 .../pipelines-viewer/base/kustomization.yaml  | 11 ++++++++++
 pipeline/pipelines-viewer/base/params.env     |  1 +
 pipeline/pipelines-viewer/base/params.yaml    |  2 ++
 .../base/virtual-service.yaml                 | 21 +++++++++++++++++++
 8 files changed, 71 insertions(+)
 create mode 100644 pipeline/pipelines-ui/base/params.env
 create mode 100644 pipeline/pipelines-ui/base/virtual-service.yaml
 create mode 100644 pipeline/pipelines-viewer/base/params.env
 create mode 100644 pipeline/pipelines-viewer/base/virtual-service.yaml

diff --git a/pipeline/pipelines-ui/base/kustomization.yaml b/pipeline/pipelines-ui/base/kustomization.yaml
index cd6109018f9..d3e0b653588 100644
--- a/pipeline/pipelines-ui/base/kustomization.yaml
+++ b/pipeline/pipelines-ui/base/kustomization.yaml
@@ -4,6 +4,11 @@ resources:
 - role.yaml
 - sa.yaml
 - service.yaml
+- virtual-service.yaml
+
+configMapGenerator:
+- name: ui-parameters
+  env: params.env
 
 images:
 - name: gcr.io/ml-pipeline/frontend
@@ -17,6 +22,13 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: metadata.namespace
+- name: ui-clusterDomain
+  objref:
+    kind: ConfigMap
+    name: ui-parameters
+    version: v1
+  fieldref:
+    fieldpath: data.uiClusterDomain
 
 configurations:
 - params.yaml
diff --git a/pipeline/pipelines-ui/base/params.env b/pipeline/pipelines-ui/base/params.env
new file mode 100644
index 00000000000..def9236f868
--- /dev/null
+++ b/pipeline/pipelines-ui/base/params.env
@@ -0,0 +1 @@
+uiClusterDomain=cluster.local
diff --git a/pipeline/pipelines-ui/base/params.yaml b/pipeline/pipelines-ui/base/params.yaml
index c8de9ba2354..24a5b1babc4 100644
--- a/pipeline/pipelines-ui/base/params.yaml
+++ b/pipeline/pipelines-ui/base/params.yaml
@@ -1,3 +1,5 @@
 varReference:
 - path: metadata/annotations/getambassador.io\/config
   kind: Service
+- path: spec/http/route/destination/host
+  kind: VirtualService
diff --git a/pipeline/pipelines-ui/base/virtual-service.yaml b/pipeline/pipelines-ui/base/virtual-service.yaml
new file mode 100644
index 00000000000..c31cf15e7b0
--- /dev/null
+++ b/pipeline/pipelines-ui/base/virtual-service.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: ml-pipeline-ui
+spec:
+  gateways:
+  - kubeflow-gateway
+  hosts:
+  - '*'
+  http:
+  - match:
+    - uri:
+        prefix: /pipeline
+    rewrite:
+      uri: /pipeline
+    route:
+    - destination:
+        host: ml-pipeline-ui.$(ui-namespace).svc.$(ui-clusterDomain)
+        port:
+          number: 80
+    timeout: 300s
diff --git a/pipeline/pipelines-viewer/base/kustomization.yaml b/pipeline/pipelines-viewer/base/kustomization.yaml
index f8103e47482..9d532894c01 100644
--- a/pipeline/pipelines-viewer/base/kustomization.yaml
+++ b/pipeline/pipelines-viewer/base/kustomization.yaml
@@ -7,9 +7,13 @@ resources:
 - deployment.yaml
 - sa.yaml
 - service.yaml
+- virtual-service.yaml
 images:
 - name: gcr.io/ml-pipeline/viewer-crd-controller
   newTag: '0.1.14'
+configMapGenerator:
+- name: viewer-parameters
+  env: params.env
 vars:
 - name: viewer-namespace
   objref:
@@ -18,5 +22,12 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: metadata.namespace
+- name: viewer-clusterDomain
+  objref:
+    kind: ConfigMap
+    name: viewer-parameters
+    version: v1
+  fieldref:
+    fieldpath: data.viewerClusterDomain
 configurations:
 - params.yaml
diff --git a/pipeline/pipelines-viewer/base/params.env b/pipeline/pipelines-viewer/base/params.env
new file mode 100644
index 00000000000..0a9639a1707
--- /dev/null
+++ b/pipeline/pipelines-viewer/base/params.env
@@ -0,0 +1 @@
+viewerClusterDomain=cluster.local
diff --git a/pipeline/pipelines-viewer/base/params.yaml b/pipeline/pipelines-viewer/base/params.yaml
index c8de9ba2354..24a5b1babc4 100644
--- a/pipeline/pipelines-viewer/base/params.yaml
+++ b/pipeline/pipelines-viewer/base/params.yaml
@@ -1,3 +1,5 @@
 varReference:
 - path: metadata/annotations/getambassador.io\/config
   kind: Service
+- path: spec/http/route/destination/host
+  kind: VirtualService
diff --git a/pipeline/pipelines-viewer/base/virtual-service.yaml b/pipeline/pipelines-viewer/base/virtual-service.yaml
new file mode 100644
index 00000000000..7cbbfa8549c
--- /dev/null
+++ b/pipeline/pipelines-viewer/base/virtual-service.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: ml-pipeline-tensorboard-ui
+spec:
+  gateways:
+  - kubeflow-gateway
+  hosts:
+  - '*'
+  http:
+  - match:
+    - uri:
+        prefix: /data
+    rewrite:
+      uri: /data
+    route:
+    - destination:
+        host: ml-pipeline-ui.$(viewer-namespace).svc.$(viewer-clusterDomain)
+        port:
+          number: 80
+    timeout: 300s