From e638ecc243cd78effaa83680d15401897c5b1113 Mon Sep 17 00:00:00 2001 From: Jeppler Date: Mon, 14 Jan 2019 14:44:21 -0600 Subject: [PATCH] [stable/concourse] Fix AWS SSM Syntax Error (#9204) * fix credential manager and version bump Signed-off-by: Jeeppler * bump version, remove newline Signed-off-by: Jeeppler * lower version number Signed-off-by: Jeeppler * bump version to 3.1.1 Signed-off-by: Jeeppler --- stable/concourse/Chart.yaml | 2 +- stable/concourse/templates/web-deployment.yaml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 73e95cd8cd..121b692816 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 3.1.0 +version: 3.1.1 appVersion: 4.2.2 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 0e1406f6bb..1fa61c3c0d 100644 --- a/stable/concourse/templates/web-deployment.yaml +++ b/stable/concourse/templates/web-deployment.yaml @@ -263,7 +263,6 @@ spec: {{- end }} {{- end }} - {{- if .Values.concourse.web.awsSsm.enabled }} - name: CONCOURSE_AWS_SSM_ACCESS_KEY valueFrom: @@ -286,13 +285,13 @@ spec: - name: AWS_REGION value: {{ .Values.concourse.web.awsSsm.region | quote }} {{- end }} - {{- if .Values.credentialManager.awsSsm.pipelineSecretTemplate }} + {{- if .Values.concourse.web.awsSsm.pipelineSecretTemplate }} - name: CONCOURSE_AWS_SSM_PIPELINE_SECRET_TEMPLATE - value: {{ .Values.credentialManager.awsSsm.pipelineSecretTemplate | quote }} + value: {{ .Values.concourse.web.awsSsm.pipelineSecretTemplate | quote }} {{- end }} - {{- if .Values.credentialManager.awsSsm.teamSecretTemplate }} + {{- if .Values.concourse.web.awsSsm.teamSecretTemplate }} - name: CONCOURSE_AWS_SSM_TEAM_SECRET_TEMPLATE - value: {{ .Values.credentialManager.awsSsm.teamSecretTemplate | quote }} + value: {{ .Values.concourse.web.awsSsm.teamSecretTemplate | quote }} {{- end }} {{- end }}