[stable/atlantis] Updating AWS to not require 'credentials' for use w…

…ith IRSA (helm#21305) * fix(atlantis): Updating AWS to not require 'credentials' for use with IRSA Signed-off-by: Scott Crooks <scott.crooks@gmail.com> * fix(atlantis): Only making 'credentials' optional Signed-off-by: Scott Crooks <scott.crooks@gmail.com> Signed-off-by: Adrien Loiseau <adrien.loiseau@logic-immo.com>
li-adrienloiseau · Jul 29, 2020 · 5810aa3 · 5810aa3
1 parent d9835d8
commit 5810aa3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/stable/atlantis/Chart.yaml b/stable/atlantis/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.11.1"
 description: A Helm chart for Atlantis https://www.runatlantis.io
 name: atlantis
-version: 3.11.0
+version: 3.11.1
 keywords:
 - terraform
 home: https://www.runatlantis.io

diff --git a/stable/atlantis/templates/secret-aws.yaml b/stable/atlantis/templates/secret-aws.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.aws}}
+{{- if .Values.aws -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,6 +9,8 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  credentials: {{ .Values.aws.credentials | b64enc }}
+{{- if .Values.aws.credentials }}
+  credentials: {{ toYaml .Values.aws.credentials | b64enc }}
+{{- end }}
   config: {{ .Values.aws.config | b64enc }}
-{{- end }}
+{{- end -}}
diff --git a/stable/atlantis/templates/statefulset.yaml b/stable/atlantis/templates/statefulset.yaml
@@ -258,7 +258,7 @@ spec:
             readOnly: true
             mountPath: /etc/secret-gitconfig
           {{- end }}
-          {{- if or .Values.aws .Values.awsSecretName}}
+          {{- if or .Values.aws .Values.awsSecretName }}
           - name: aws-volume
             readOnly: true
             mountPath: /home/atlantis/.aws