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

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

diff --git a/charts/arvados/templates/slurm-controller-deployment.yaml b/charts/arvados/templates/slurm-controller-deployment.yaml
index 54773fb76c50f25d24bfbec598ede5f3342920cc..733749acda7f6f80420bf6aab04e3cbf8bd29385 100644 (file)
--- a/charts/arvados/templates/slurm-controller-deployment.yaml
+++ b/charts/arvados/templates/slurm-controller-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       dnsConfig:
         searches:
-          - "arvados-slurm-compute.default.svc.cluster.local"
+          - "arvados-slurm-compute.{{ .Release.Namespace }}.svc.cluster.local"
       terminationGracePeriodSeconds: 1
       containers:
         - name: {{ .Chart.Name }}
@@ -35,7 +35,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "apt-get -qqy install ed && echo ',s/google.internal/google.internal arvados-slurm-compute.default.svc.cluster.local/g; w' | tr \\; '\\012' | ed -s /etc/resolv.conf && 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 && slurmctld -D"
+            - "if grep -q google.internal /etc/resolv.conf; then apt-get -qqy install ed && echo ',s/google.internal/google.internal arvados-slurm-compute.default.svc.cluster.local/g; w' | tr \\; '\\012' | ed -s /etc/resolv.conf; fi && 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 && slurmctld -D"
           env:
             - name : ARVADOS_API_HOST
               value: "{{ .Values.externalIP }}:444"