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
/
workbench-deployment.yaml
diff --git
a/charts/arvados/templates/workbench-deployment.yaml
b/charts/arvados/templates/workbench-deployment.yaml
index 6ed3a44a4e2fbd7b7d1910a3af0f57f2d796fe1e..e8c506e451c2fdc97300ba4fdf4330facb9f1990 100644
(file)
--- a/
charts/arvados/templates/workbench-deployment.yaml
+++ b/
charts/arvados/templates/workbench-deployment.yaml
@@
-2,7
+2,7
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: Deployment
metadata:
name: "arvados-workbench"
kind: Deployment
metadata:
name: "arvados-workbench"
@@
-12,7
+12,6
@@
metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- replicas: 1
selector:
matchLabels:
app: arvados-workbench
selector:
matchLabels:
app: arvados-workbench
@@
-30,11
+29,14
@@
spec:
command:
- "sh"
- "-c"
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:
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
- name: workbench-configmap
mountPath: /etc/arvados/workbench/application.yml
subPath: application.yml
@@
-47,10
+49,24
@@
spec:
- name: ssl-configmap
mountPath: /etc/ssl/private/workbench.key
subPath: key
- 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:
volumes:
+ - name: etc-configmap
+ configMap:
+ name: etc-configmap
- name: workbench-configmap
configMap:
name: arvados-workbench-configmap
- name: ssl-configmap
configMap:
name: ssl-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 }}
+