From: Ward Vandewege <ward@jhvc.com>
Date: Tue, 28 Apr 2020 17:36:31 +0000 (-0400)
Subject: Work around silly limitation of 6 search domains in /etc/resolv.conf.
X-Git-Url: https://git.arvados.org/arvados-k8s.git/commitdiff_plain/f0ef2afd7890f6f20e0415e084313934a283d498

Work around silly limitation of 6 search domains in /etc/resolv.conf.
This limitation was removed from the GNU C library release 2.26 in 2017
but Kubernetes still enforces it. Kubernetes uses 3 search domains. This
is no problem on Minikube, but on GKE the other 3 slots are populated by
GCP.

We can actually edit resolv.conf, but only in place, which is why we
fall back on `ed`...

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 b793c89..54773fb 100644
--- a/charts/arvados/templates/slurm-controller-deployment.yaml
+++ b/charts/arvados/templates/slurm-controller-deployment.yaml
@@ -35,7 +35,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "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"
+            - "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"
           env:
             - name : ARVADOS_API_HOST
               value: "{{ .Values.externalIP }}:444"