projects
/
arvados-k8s.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade the helm charts to Arvados 2.1.0.
[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..aa7a6215443e2c3a7e245604c5727a802a8ee6d0 100644
(file)
--- a/
charts/arvados/templates/api-server-deployment.yaml
+++ b/
charts/arvados/templates/api-server-deployment.yaml
@@
-29,7
+29,7
@@
spec:
command:
- "sh"
- "-c"
command:
- "sh"
- "-c"
- - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server={{ .Values.arvados.versions.distribution.arvadosApiServer }} && cd /var/www/arvados-api/current && exec /sbin/my_init"
+ - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server={{ .Values.arvados.versions.distribution.arvadosApiServer }}
arvados-server={{ .Values.arvados.versions.distribution.arvadosApiServer }}
&& cd /var/www/arvados-api/current && exec /sbin/my_init"
env:
- name: RAILS_ENV
value: "production"
env:
- name: RAILS_ENV
value: "production"
@@
-37,9
+37,6
@@
spec:
- name: api-server-configmap
mountPath: /init-scripts/90-init-db.sh
subPath: 90-init-db.sh
- name: api-server-configmap
mountPath: /init-scripts/90-init-db.sh
subPath: 90-init-db.sh
- - name: api-server-configmap
- mountPath: /etc/arvados/api/database.yml
- subPath: database.yml
- name: etc-configmap
mountPath: /etc/arvados/config.yml
subPath: config.yml
- name: etc-configmap
mountPath: /etc/arvados/config.yml
subPath: config.yml
@@
-49,6
+46,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
+88,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 }}