Merge branch 'master' of https://github.com/mluds/arvados-k8s into mluds-master

[arvados-k8s.git] / charts / arvados / templates / slurm-compute-deployment.yaml

diff --git a/charts/arvados/templates/slurm-compute-deployment.yaml b/charts/arvados/templates/slurm-compute-deployment.yaml
index fdbc3384826b4ff41e68d5b87876ce2985a71987..0819b34a9ea12f021317d9ef405518b2a5a07d9f 100644 (file)
--- a/charts/arvados/templates/slurm-compute-deployment.yaml
+++ b/charts/arvados/templates/slurm-compute-deployment.yaml
@@ -12,7 +12,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: 4
+  replicas: {{ .Values.compute.nodes }}
   podManagementPolicy: Parallel
   serviceName: arvados-slurm-compute
   selector:
@@ -25,10 +25,12 @@ spec:
         app: arvados-slurm-compute
         release: {{ .Release.Name }}
     spec:
+      dnsConfig:
+        searches:
+          - "arvados-slurm-compute.{{ .Release.Namespace }}.svc.cluster.local"
       terminationGracePeriodSeconds: 1
       containers:
         - name: {{ .Chart.Name }}
-          hostname: arvados-slurm-compute
           image: "cure/arvados-slurm-runtime"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
@@ -61,10 +63,3 @@ spec:
             defaultMode: 0400
         - name: docker-graph-storage
           emptyDir: {}
-
-#            - "/usr/local/bin/bootstrap.sh crunch-dispatch-slurm={{ .Values.arvados.versions.distribution.crunchDispatchSlurm }} && chown munge /etc/munge/munge.key && chmod 0400 /etc/munge/munge.key && sudo -u munge munged && slurmctld -D && crunch-dispatch-slurm"
-#            - "/usr/local/bin/bootstrap.sh crunch-dispatch-slurm={{ .Values.arvados.versions.distribution.crunchDispatchSlurm }} && sudo -u munge munged && slurmctld -D && crunch-dispatch-slurm"
-#            - "/usr/local/bin/bootstrap.sh crunch-dispatch-slurm={{ .Values.arvados.versions.distribution.crunchDispatchSlurm }} && crunch-dispatch-slurm"
-
-# for slurm client, compute node
-#            - "/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 }} && chown munge /etc/munge/munge.key; chmod 0400 /etc/munge/munge.key; sudo -u munge munged && slurmd -D"