From: Ward Vandewege <ward@jhvc.com>
Date: Thu, 30 Apr 2020 19:25:40 +0000 (-0400)
Subject: Add workbench2, and make it the default.
X-Git-Url: https://git.arvados.org/arvados-k8s.git/commitdiff_plain/cfea453d1a6fc92f675251a071e4276ef2e30b3f

Add workbench2, and make it the default.

refs #16384

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@jhvc.com>
---

diff --git a/charts/arvados/config/config.yml b/charts/arvados/config/config.yml
index 3401e0a..292e1c4 100644
--- a/charts/arvados/config/config.yml
+++ b/charts/arvados/config/config.yml
@@ -89,6 +89,8 @@ Clusters:
         InternalURLs:
           "http://localhost:29003": {}
       Workbench1:
+        ExternalURL: https://{{ .Values.externalIP }}:445
+      Workbench2:
         ExternalURL: https://{{ .Values.externalIP }}
     TLS:
       Insecure: true
diff --git a/charts/arvados/config/workbench/nginx.conf b/charts/arvados/config/workbench/nginx.conf
index b2e59cf..298788d 100644
--- a/charts/arvados/config/workbench/nginx.conf
+++ b/charts/arvados/config/workbench/nginx.conf
@@ -25,7 +25,7 @@ upstream workbench {
 proxy_http_version 1.1;
 
 server {
-  listen       0.0.0.0:443 ssl;
+  listen       0.0.0.0:445 ssl;
   server_name  public-workbench;
 
   ssl on;
@@ -49,3 +49,24 @@ server {
     proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
+
+server {
+  listen       0.0.0.0:443 ssl;
+  server_name  public-workbench2;
+
+  ssl on;
+  ssl_certificate     /etc/ssl/certs/workbench.pem;
+  ssl_certificate_key /etc/ssl/private/workbench.key;
+
+  # Workbench2 uses a call to /config.json to bootstrap itself
+  # and find out where to contact the API server.
+  location /config.json {
+    return 200 '{ "API_HOST": "{{ .Values.externalIP }}:444" }';
+  }
+
+  location / {
+    root      /var/www/arvados-workbench2/workbench2;
+    index     index.html;
+    try_files $uri $uri/ /index.html;
+  }
+}
diff --git a/charts/arvados/templates/workbench-deployment.yaml b/charts/arvados/templates/workbench-deployment.yaml
index f9e2c3f..997fe46 100644
--- a/charts/arvados/templates/workbench-deployment.yaml
+++ b/charts/arvados/templates/workbench-deployment.yaml
@@ -29,7 +29,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "/usr/local/bin/bootstrap.sh arvados-workbench={{ .Values.arvados.versions.distribution.arvadosWorkbench }} && exec /sbin/my_init"
+            - "/usr/local/bin/bootstrap.sh arvados-workbench={{ .Values.arvados.versions.distribution.arvadosWorkbench }} arvados-workbench2={{ .Values.arvados.versions.distribution.arvadosWorkbench2 }} && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
diff --git a/charts/arvados/templates/workbench-service.yaml b/charts/arvados/templates/workbench-service.yaml
index 86ee2cb..a12aa22 100644
--- a/charts/arvados/templates/workbench-service.yaml
+++ b/charts/arvados/templates/workbench-service.yaml
@@ -15,9 +15,13 @@ spec:
   type: LoadBalancer
   loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
-  - name: http
+  - name: wb2
     port: 443
     targetPort: 443
     protocol: TCP
+  - name: wb
+    port: 445
+    targetPort: 445
+    protocol: TCP
   selector:
     app: arvados-workbench
diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml
index facdcd5..724cfd8 100644
--- a/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@ -41,6 +41,7 @@ arvados:
       arvadosGitHttpd: 2.0.2-1
       arvadosHealth: 2.0.2-1
       arvadosWorkbench: 2.0.2-1
+      arvadosWorkbench2: 2.0.2-1
       arvadosWs: 2.0.2-1
       arvadosSSOServer: 1.1.4-1
       crunchDispatchSlurm: 2.0.2-1