From db4db2bff7bfc2b485516c72e66abe1cd583a297 Mon Sep 17 00:00:00 2001 From: Chris Hiestand Date: Sun, 4 Nov 2018 07:11:14 -0800 Subject: [PATCH] concourse: consume local-users from k8s secret (#8099) instead of directly from helm chart. k8s secret will use the chart value as a default, so functionality is not lost Signed-off-by: Chris Hiestand --- stable/concourse/Chart.yaml | 2 +- stable/concourse/templates/web-deployment.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 6b7d832020..7c8650efca 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 2.1.0 +version: 2.1.1 appVersion: 4.2.1 description: Concourse is a simple and scalable CI system. icon: https://avatars1.githubusercontent.com/u/7809479 diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml index 298de88dca..1c36b76f68 100644 --- a/stable/concourse/templates/web-deployment.yaml +++ b/stable/concourse/templates/web-deployment.yaml @@ -49,7 +49,10 @@ spec: {{- end }} {{- if .Values.concourse.web.localAuth.enabled }} - name: CONCOURSE_ADD_LOCAL_USER - value: {{ .Values.secrets.localUsers | quote }} + valueFrom: + secretKeyRef: + name: {{ template "concourse.concourse.fullname" . }} + key: local-users {{- end }} {{- if .Values.concourse.web.tlsBindPort }} - name: CONCOURSE_TLS_BIND_PORT