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

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

diff --git a/charts/arvados/templates/crunch-dispatch-slurm-deployment.yaml b/charts/arvados/templates/crunch-dispatch-slurm-deployment.yaml
index 95304be3fb7e7b30dd3a878dc0694b550c8fc35c..f4322b5adf0c4ba115c1571037f6a66eb32e000a 100644 (file)
--- a/charts/arvados/templates/crunch-dispatch-slurm-deployment.yaml
+++ b/charts/arvados/templates/crunch-dispatch-slurm-deployment.yaml
@@ -12,8 +12,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: 1
-  serviceName: arvados-crunch-dispatch-slurm
   selector:
     matchLabels:
       app: arvados-crunch-dispatch-slurm
@@ -24,9 +22,11 @@ spec:
         app: arvados-crunch-dispatch-slurm
         release: {{ .Release.Name }}
     spec:
+      dnsConfig:
+        searches:
+          - "arvados-slurm-compute.{{ .Release.Namespace }}.svc.cluster.local"
       containers:
         - name: {{ .Chart.Name }}
-          hostname: arvados-crunch-dispatch-slurm
           image: "cure/arvados-slurm-runtime"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
@@ -41,22 +41,21 @@ spec:
             - name : ARVADOS_API_TOKEN
               value: "{{ .Values.superUserSecret }}"
           volumeMounts:
+            - name: etc-configmap
+              mountPath: /etc/arvados/config.yml
+              subPath: config.yml
             - name: slurm-configmap
               mountPath: /etc/slurm-llnl/slurm.conf
               subPath: slurm.conf
             - name: slurm-configmap
               mountPath: /etc/munge/munge.key
               subPath: munge.key
-            - name: crunch-dispatch-slurm-configmap
-              mountPath: /etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml
-              subPath: crunch-dispatch-slurm.yml
 
       volumes:
+        - name: etc-configmap
+          configMap:
+            name: etc-configmap
         - name: slurm-configmap
           configMap:
             name: slurm-configmap
             defaultMode: 0400
-        - name: crunch-dispatch-slurm-configmap
-          configMap:
-            name: crunch-dispatch-slurm-configmap
-