helm: Convert the anonymous and superuser token to values in values.yaml

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

diff --git a/arvados/templates/shell-server-deployment.yaml b/arvados/templates/shell-server-deployment.yaml
index b4df56d5f68ab1e16e2467bc9a13f02b1643e981..c07d07dfe4ac75fbe522e52ce957c66cbabb291c 100644 (file)
--- a/arvados/templates/shell-server-deployment.yaml
+++ b/arvados/templates/shell-server-deployment.yaml
@@ -30,17 +30,16 @@ spec:
           command:
             - "sh"
             - "-c"
-            # TODO: the apt-get update should be run in the Dockerfile
-            - "apt-get update && /usr/local/bin/bootstrap.sh python-arvados-python-client=1.1.3.20180404223512* gem:arvados-cli=1.1.4.20180412190507 gem:arvados-login-sync=1.1.4.20180412190507 crunchrunner=1.1.3.20180403215323* python-arvados-fuse=1.1.3.20180404223512* && install /init-scripts-staging/* /etc/my_init.d && /sbin/my_init"
+            - "/usr/local/bin/bootstrap.sh python-arvados-python-client={{ .Values.arvados.versions.distribution.pythonArvadosPythonClient }} gem:arvados-cli={{ .Values.arvados.versions.gem.arvadosCLI }} gem:arvados-login-sync={{ .Values.arvados.versions.gem.arvadosLoginSync }} crunchrunner={{ .Values.arvados.versions.distribution.crunchRunner }} python-arvados-fuse={{ .Values.arvados.versions.distribution.pythonArvadosFuse }} && install /init-scripts-staging/* /etc/my_init.d && /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
             - name: ARVADOS_API_HOST
-              value: "8.8.8.8:444"
+              value: "{{ .Values.externalIP }}:444"
             - name : ARVADOS_API_HOST_INSECURE
               value: "true"
             - name : ARVADOS_API_TOKEN
-              value: "thisisnotaverygoodsuperusersecretstring00000000000"
+              value: "{{ .Values.anonymousUserSecret }}"
           volumeMounts:
             - name: shell-server-configmap
               mountPath: /init-scripts-staging/99-init-keep.sh