From 7bbc7b2e1c25e59638761c4d0a697b2d6672a6eb Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 30 Apr 2020 11:57:49 -0400 Subject: [PATCH] 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 --- charts/arvados/templates/slurm-controller-deployment.yaml | 2 +- charts/arvados/templates/slurm-controller-service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/arvados/templates/slurm-controller-deployment.yaml b/charts/arvados/templates/slurm-controller-deployment.yaml index 54773fb..4aa57cb 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" - - "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 d4d09aa..955a508 100644 --- 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 -- 2.30.2