support custom CA bundle for the api-server

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

diff --git a/charts/arvados/templates/api-server-deployment.yaml b/charts/arvados/templates/api-server-deployment.yaml
index f3451af54ee02767077696981a8ce1ab23c8141c..4f90fcaeb5ec5026b60377c02d75665cbe0346d5 100644 (file)
--- a/charts/arvados/templates/api-server-deployment.yaml
+++ b/charts/arvados/templates/api-server-deployment.yaml
@@ -40,25 +40,59 @@ spec:
             - name: api-server-configmap
               mountPath: /etc/arvados/api/database.yml
               subPath: database.yml
-            - name: api-server-configmap
-              mountPath: /etc/arvados/api/application.yml
-              subPath: application.yml
+            - name: etc-configmap
+              mountPath: /etc/arvados/config.yml
+              subPath: config.yml
             - name: api-server-configmap
               mountPath: /create-workbench-api-client.rb
               subPath: create-workbench-api-client.rb
             - name: api-server-configmap
               mountPath: /etc/nginx/sites-enabled/api-server.conf
               subPath: nginx.conf
+            {{- if .Values.customCABundle }}
+            - name: custom-ca-bundle-volume
+              mountPath: /etc/ssl/certs/ca-certificates.crt
+              subPath: custom-ca-bundle.pem
+            {{- end }}
+        - name: arvados-controller
+          image: "cure/arvados-runtime"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+            - "sh"
+            - "-c"
+            - "/usr/local/bin/bootstrap.sh arvados-controller={{ .Values.arvados.versions.distribution.arvadosController }} && arvados-controller"
+          volumeMounts:
+            - name: etc-configmap
+              mountPath: /etc/arvados/config.yml
+              subPath: config.yml
+        - name: nginx
+          image: "nginx:1.17"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - name: nginx-configmap
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: nginx.conf
             - name: ssl-configmap
-              mountPath: /etc/ssl/certs/api-server.pem
+              mountPath: /etc/nginx/ssl.crt
               subPath: cert
             - name: ssl-configmap
-              mountPath: /etc/ssl/private/api-server.key
+              mountPath: /etc/nginx/ssl.key
               subPath: key
       volumes:
         - name: api-server-configmap
           configMap:
             name: arvados-api-server-configmap
+        - name: etc-configmap
+          configMap:
+            name: etc-configmap
         - name: ssl-configmap
           configMap:
             name: ssl-configmap
+        - name: nginx-configmap
+          configMap:
+            name: arvados-api-server-https-configmap
+        {{- if .Values.customCABundle }}
+        - name: custom-ca-bundle-volume
+          configMap:
+            name: custom-ca-bundle-configmap
+        {{- end }}