Merge branch 'mluds-master' into master

[arvados-k8s.git] / charts / arvados / templates / workbench-deployment.yaml

diff --git a/charts/arvados/templates/workbench-deployment.yaml b/charts/arvados/templates/workbench-deployment.yaml
index 7e50ddbb9be46bcdc30dafecc0c1571d86c20b85..e8c506e451c2fdc97300ba4fdf4330facb9f1990 100644 (file)
--- a/charts/arvados/templates/workbench-deployment.yaml
+++ b/charts/arvados/templates/workbench-deployment.yaml
@@ -29,11 +29,14 @@ 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"
           volumeMounts:
+            - name: etc-configmap
+              mountPath: /etc/arvados/config.yml
+              subPath: config.yml
             - name: workbench-configmap
               mountPath: /etc/arvados/workbench/application.yml
               subPath: application.yml
@@ -46,10 +49,24 @@ spec:
             - name: ssl-configmap
               mountPath: /etc/ssl/private/workbench.key
               subPath: key
+            {{- if .Values.customCABundle }}
+            - name: custom-ca-bundle-volume
+              mountPath: /etc/ssl/certs/ca-certificates.crt
+              subPath: custom-ca-bundle.pem
+            {{- end }}
       volumes:
+        - name: etc-configmap
+          configMap:
+            name: etc-configmap
         - name: workbench-configmap
           configMap:
             name: arvados-workbench-configmap
         - name: ssl-configmap
           configMap:
             name: ssl-configmap
+        {{- if .Values.customCABundle }}
+        - name: custom-ca-bundle-volume
+          configMap:
+            name: custom-ca-bundle-configmap
+        {{- end }}
+