Merge pull request #349 from bdellegrazie/fix/aws-secrets-integration

fix(aws-secrets): use AWS secrets only if enabled
concourse · Oct 31, 2023 · 2e71523 · 2e71523
2 parents 8a3d3e1 + eb29fba
commit 2e71523
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
@@ -239,14 +239,6 @@ spec:
             - name: CONCOURSE_SECRET_CACHE_PURGE_INTERVAL
               value: {{ .Values.concourse.web.secretCachePurgeInterval | quote }}
             {{- end }}
-            {{- if .Values.concourse.web.awsSecretsManager.region }}
-            - name: CONCOURSE_AWS_SECRETSMANAGER_REGION
-              value: {{ .Values.concourse.web.awsSecretsManager.region | quote }}
-            {{- end }}
-            {{- if .Values.concourse.web.awsSsm.region }}
-            - name: CONCOURSE_AWS_SSM_REGION
-              value: {{ .Values.concourse.web.awsSsm.region | quote }}
-            {{- end }}
             {{- if .Values.concourse.web.tracing.serviceName }}
             - name: CONCOURSE_TRACING_SERVICE_NAME
               value: {{ .Values.concourse.web.tracing.serviceName | quote }}
@@ -540,6 +532,10 @@ spec:
             - name: CONCOURSE_AWS_SECRETSMANAGER_PIPELINE_SECRET_TEMPLATE
               value: {{ .Values.concourse.web.awsSecretsManager.pipelineSecretTemplate | quote }}
             {{- end }}
+            {{- if .Values.concourse.web.awsSecretsManager.region }}
+            - name: CONCOURSE_AWS_SECRETSMANAGER_REGION
+              value: {{ .Values.concourse.web.awsSecretsManager.region | quote }}
+            {{- end }}
             {{- if .Values.concourse.web.awsSecretsManager.teamSecretTemplate }}
             - name: CONCOURSE_AWS_SECRETSMANAGER_TEAM_SECRET_TEMPLATE
               value: {{ .Values.concourse.web.awsSecretsManager.teamSecretTemplate | quote }}
@@ -573,6 +569,10 @@ spec:
             - name: CONCOURSE_AWS_SSM_PIPELINE_SECRET_TEMPLATE
               value: {{ .Values.concourse.web.awsSsm.pipelineSecretTemplate | quote }}
             {{- end }}
+            {{- if .Values.concourse.web.awsSsm.region }}
+            - name: CONCOURSE_AWS_SSM_REGION
+              value: {{ .Values.concourse.web.awsSsm.region | quote }}
+            {{- end }}
             {{- if .Values.concourse.web.awsSsm.teamSecretTemplate }}
             - name: CONCOURSE_AWS_SSM_TEAM_SECRET_TEMPLATE
               value: {{ .Values.concourse.web.awsSsm.teamSecretTemplate | quote }}