projects
/
arvados-k8s.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mluds-master' into master
[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 7b5bb5ce062378c754d5373d95c719553188b5b8..4f90fcaeb5ec5026b60377c02d75665cbe0346d5 100644
(file)
--- a/
charts/arvados/templates/api-server-deployment.yaml
+++ b/
charts/arvados/templates/api-server-deployment.yaml
@@
-49,6
+49,11
@@
spec:
- name: api-server-configmap
mountPath: /etc/nginx/sites-enabled/api-server.conf
subPath: nginx.conf
- 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 }}
- name: arvados-controller
image: "cure/arvados-runtime"
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@
-86,3
+91,8
@@
spec:
- name: nginx-configmap
configMap:
name: arvados-api-server-https-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 }}