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 3401e0acedd4a27ec187fb970eeab33425a17df1..292e1c42f922ea6f3762456ad77f88b03dfdc6bb 100644 (file)
--- a/charts/arvados/config/config.yml
+++ b/charts/arvados/config/config.yml
@@ -89,6 +89,8 @@ Clusters:
         InternalURLs:
           "http://localhost:29003": {}
       Workbench1:
         InternalURLs:
           "http://localhost:29003": {}
       Workbench1:

+        ExternalURL: https://{{ .Values.externalIP }}:445
+      Workbench2:

         ExternalURL: https://{{ .Values.externalIP }}
     TLS:
       Insecure: true
         ExternalURL: https://{{ .Values.externalIP }}
     TLS:
       Insecure: true

diff --git a/charts/arvados/config/workbench/nginx.conf b/charts/arvados/config/workbench/nginx.conf
index b2e59cfbf801b331c2144bdbe785c19ac1cce6b2..298788dba46060a0487fe24150b9103d13f9e05c 100644 (file)
--- 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 {
 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;
   server_name  public-workbench;
 
   ssl on;


@@ -49,3 +49,24 @@ server {
     proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
     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 f9e2c3fc5c032a2bda8647c022452136b6f23ee1..997fe469a308cb4e6faf06893ac42cacab4da532 100644 (file)
--- a/charts/arvados/templates/workbench-deployment.yaml
+++ b/charts/arvados/templates/workbench-deployment.yaml
@@ -29,7 +29,7 @@ spec:
           command:
             - "sh"
             - "-c"
           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"
           env:
             - name: RAILS_ENV
               value: "production"

diff --git a/charts/arvados/templates/workbench-service.yaml b/charts/arvados/templates/workbench-service.yaml
index 86ee2cb54ac8a8cdb2d4680a1026bd058252e681..a12aa225dea8bdb0f53120a1cc40f1e139e46018 100644 (file)
--- 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:
   type: LoadBalancer
   loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:

-  - name: http
+  - name: wb2

     port: 443
     targetPort: 443
     protocol: TCP
     port: 443
     targetPort: 443
     protocol: TCP

+  - name: wb
+    port: 445
+    targetPort: 445
+    protocol: TCP

   selector:
     app: arvados-workbench
   selector:
     app: arvados-workbench

diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml
index facdcd5609cc58cd4e3602ce6b77d6faeb114ee8..724cfd88b586de3fd3cf335a8e8dd2c6e4b9a1fe 100644 (file)
--- 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
       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
       arvadosWs: 2.0.2-1
       arvadosSSOServer: 1.1.4-1
       crunchDispatchSlurm: 2.0.2-1