Update charts/atlantis/templates/statefulset.yaml

Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
runatlantis · May 23, 2024 · d1dac8d · d1dac8d
1 parent cad322e
commit d1dac8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/charts/atlantis/README.md b/charts/atlantis/README.md
@@ -79,7 +79,7 @@ extraManifests:
 | atlantisDataDirectory | string | `"/atlantis-data"` | Path to the data directory for the volumeMount. |
 | atlantisUrl | string | `""` | An option to override the atlantis url, if not using an ingress, set it to the external IP. Check values.yaml for examples. |
 | aws | object | `{}` | To specify AWS credentials to be mapped to ~/.aws or to aws.directory. Check values.yaml for examples. |
-| awsSecretName | string | `""` | To reference an already existing Secret object with AWS credentials |
+| awsSecretName | string | `""` | To reference an already existing Secret object with AWS credentials. This has priority over the aws.config and aws.credential fields. |
 | azuredevops | object | `{}` | If using Azure DevOps, please enter your values as follows. The chart will perform the base64 encoding for you for values that are stored in secrets. Check values.yaml for examples. |
 | basicAuth | object | `{"password":"","username":""}` | Optionally specify an username and a password for basic authentication. |
 | basicAuthSecretName | string | `""` | If managing secrets outside the chart for the Basic Auth secret, use this variable to reference the secret name. |

diff --git a/charts/atlantis/templates/statefulset.yaml b/charts/atlantis/templates/statefulset.yaml
@@ -525,6 +525,11 @@ spec:
             mountPath: /home/atlantis/.netrc
             subPath: netrc
           {{- end }}
+          {{- if .Values.awsSecretName }}
+          - name: aws-volume
+            readOnly: true
+            mountPath: {{ .Values.aws.directory | default "/home/atlantis/.aws" }}
+          {{- else }}
           {{- range $filename, $_ := .Values.aws }}
           {{- if has $filename (list "credentials" "config") }}
           - name: aws-volume
@@ -533,10 +538,6 @@ spec:
             subPath: {{ $filename }}
           {{- end }}
           {{- end }}
-          {{- if .Values.awsSecretName }}
-          - name: aws-volume
-            readOnly: true
-            mountPath: {{ .Values.aws.directory | default "/home/atlantis/.aws" }}
           {{- end }}
           {{- if .Values.tlsSecretName }}
           - name: tls

diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
@@ -138,7 +138,7 @@ aws: {}
 #     source_profile = default
 #   directory: "/home/atlantis/.aws"
 
-# -- To reference an already existing Secret object with AWS credentials
+# -- To reference an already existing Secret object with AWS credentials. This has priority over the aws.config and aws.credential fields.
 awsSecretName: ""
 
 # -- To keep backwards compatibility only.