Bugfixes: fix arvados-slurm-controller-0 container start on minikube,

fix arvados-slurm-controller StatefulSet warning.

No issue #

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

diff --git a/charts/arvados/templates/slurm-controller-deployment.yaml b/charts/arvados/templates/slurm-controller-deployment.yaml
index 54773fb76c50f25d24bfbec598ede5f3342920cc..4aa57cbd385d5df6d7fd8bdf6d42ef4268811a90 100644 (file)
--- a/charts/arvados/templates/slurm-controller-deployment.yaml
+++ b/charts/arvados/templates/slurm-controller-deployment.yaml
@@ -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"

diff --git a/charts/arvados/templates/slurm-controller-service.yaml b/charts/arvados/templates/slurm-controller-service.yaml
index d4d09aa83a0e4b8a48c6f5e9201d7371436a07e1..955a508880aa398d03aa8f9dd07dd9cf1710e176 100644 (file)
--- a/charts/arvados/templates/slurm-controller-service.yaml
+++ b/charts/arvados/templates/slurm-controller-service.yaml
@@ -16,4 +16,4 @@ spec:
   - port: 6817
     protocol: TCP
   selector:
-    app: arvados-slurm-controller-0
+    app: arvados-slurm-controller