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 997fe469a308cb4e6faf06893ac42cacab4da532..e8c506e451c2fdc97300ba4fdf4330facb9f1990 100644 (file)
--- a/charts/arvados/templates/workbench-deployment.yaml
+++ b/charts/arvados/templates/workbench-deployment.yaml
@@ -49,6 +49,11 @@ 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:
@@ -59,3 +64,9 @@ spec:
         - name: ssl-configmap
           configMap:
             name: ssl-configmap
+        {{- if .Values.customCABundle }}
+        - name: custom-ca-bundle-volume
+          configMap:
+            name: custom-ca-bundle-configmap
+        {{- end }}
+