Use the python3 version of our packages.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/charts/arvados/templates/shell-server-deployment.yaml b/charts/arvados/templates/shell-server-deployment.yaml
index 9f70371d4e72a04943969063badaf95e70824314..4b323bd6755a16708d8af6affc48257a4fe48955 100644 (file)
--- a/charts/arvados/templates/shell-server-deployment.yaml
+++ b/charts/arvados/templates/shell-server-deployment.yaml
@@ -29,7 +29,7 @@ spec:
           command:
             - "sh"
             - "-c"
           command:
             - "sh"
             - "-c"

-            - "/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"
+            - "/usr/local/bin/bootstrap.sh python3-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 }} python3-arvados-fuse={{ .Values.arvados.versions.distribution.pythonArvadosFuse }} && install /init-scripts-staging/* /etc/my_init.d && /sbin/my_init"

           env:
             - name: RAILS_ENV
               value: "production"
           env:
             - name: RAILS_ENV
               value: "production"

diff --git a/charts/arvados/templates/slurm-compute-deployment.yaml b/charts/arvados/templates/slurm-compute-deployment.yaml
index 0819b34a9ea12f021317d9ef405518b2a5a07d9f..972f8f0b5e79b2f298774b335766f5b444c25636 100644 (file)
--- a/charts/arvados/templates/slurm-compute-deployment.yaml
+++ b/charts/arvados/templates/slurm-compute-deployment.yaml
@@ -36,7 +36,7 @@ spec:
           command:
             - "sh"
             - "-c"
           command:
             - "sh"
             - "-c"

-            - "/usr/local/bin/bootstrap.sh python-arvados-python-client={{ .Values.arvados.versions.distribution.pythonArvadosPythonClient }} crunch-run={{ .Values.arvados.versions.distribution.crunchRun }} python-arvados-fuse={{ .Values.arvados.versions.distribution.pythonArvadosFuse }} && mkdir /munge && cp -p /etc/munge/munge.key /munge && chown munge:munge /munge/munge.key && mkdir /var/slurm && chmod 700 /var/slurm && sudo -u munge munged --key-file=/munge/munge.key && /etc/init.d/docker start && slurmd -D"
+            - "/usr/local/bin/bootstrap.sh python3-arvados-python-client={{ .Values.arvados.versions.distribution.pythonArvadosPythonClient }} crunch-run={{ .Values.arvados.versions.distribution.crunchRun }} python3-arvados-fuse={{ .Values.arvados.versions.distribution.pythonArvadosFuse }} && mkdir /munge && cp -p /etc/munge/munge.key /munge && chown munge:munge /munge/munge.key && mkdir /var/slurm && chmod 700 /var/slurm && sudo -u munge munged --key-file=/munge/munge.key && /etc/init.d/docker start && slurmd -D"

           securityContext:
             privileged: true
           env:
           securityContext:
             privileged: true
           env: