From 4b07e34ec71671d8e9ae02eb9c22c2a50cf8a73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norbert=20Buchm=C3=BCller?= <38939441+norbertbuchmueller@users.noreply.github.com> Date: Thu, 6 Sep 2018 23:17:16 +0200 Subject: [PATCH] stable/concourse: use the correct work dir in the container preamble (#7061) * stable/concourse: use the correct work dir in the container preamble There's a short preamble (written in shell) in the container that cleans up before the container starts. It had the work dir hard-coded, while its value has been configurable since a few chart versions. Now it uses the same configured value. Signed-off-by: Norbert Buchmueller * stable/concourse: bump chart version to 1.16.1 Signed-off-by: Norbert Buchmueller * stable/concourse: use the correct work dir in the volume's `mountPath` Signed-off-by: Norbert Buchmueller --- stable/concourse/Chart.yaml | 2 +- stable/concourse/templates/worker-statefulset.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 6cb1eb29e7..b97fc20d48 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 1.16.0 +version: 1.16.1 appVersion: 3.14.1 description: Concourse is a simple and scalable CI system. icon: https://avatars1.githubusercontent.com/u/7809479 diff --git a/stable/concourse/templates/worker-statefulset.yaml b/stable/concourse/templates/worker-statefulset.yaml index 1674fb0e6e..ea26bfb4ad 100644 --- a/stable/concourse/templates/worker-statefulset.yaml +++ b/stable/concourse/templates/worker-statefulset.yaml @@ -39,7 +39,7 @@ spec: - -c - |- cp /dev/null /tmp/.liveness_probe - rm -rf /concourse-work-dir/* + rm -rf ${CONCOURSE_WORK_DIR:-/concourse-work-dir}/* while ! concourse retire-worker --name=${HOSTNAME} | grep -q worker-not-found; do touch /tmp/.pre_start_cleanup sleep 5 @@ -111,7 +111,7 @@ spec: mountPath: /concourse-keys readOnly: true - name: concourse-work-dir - mountPath: /concourse-work-dir + mountPath: {{ .Values.concourse.workingDirectory | default "/concourse-work-dir" | quote }} {{- if .Values.worker.additionalVolumeMounts }} {{ toYaml .Values.worker.additionalVolumeMounts | indent 12 }} {{- end }}