Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/atlantis] Atlantis aws #14189

Merged
merged 4 commits into from
May 28, 2019
Merged

[stable/atlantis] Atlantis aws #14189

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2294ac
Adding secret name reference for AWS credentials
wvidana May 28, 2019
7a8f774
Version bump - new feature
wvidana May 28, 2019
fafe933
Describe contents of AWS Secret for awsSecretName
wvidana May 28, 2019
80adf75
Update stable/atlantis/values.yaml
wvidana May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/atlantis/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "v0.7.1"
description: A Helm chart for Atlantis https://www.runatlantis.io
name: atlantis
version: 3.4.1
version: 3.5.1
keywords:
- terraform
home: https://www.runatlantis.io
Expand Down
1 change: 1 addition & 0 deletions stable/atlantis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ The following options are supported. See [values.yaml](values.yaml) for more de
| `dataStorage` | Amount of storage available for Atlantis' data directory (mostly used to check out git repositories). | `5Gi` |
| `aws.config` | Contents of a file to be mounted to `~/.aws/config`. | n/a |
| `aws.credentials` | Contents of a file to be mounted to `~/.aws/credentials`. | n/a |
| `awsSecretName` | Secret name containing AWS credentials - will override aws.credentials and aws.config. Will be used a volume mount on `$HOME/.aws`, so it needs a `credentials` key. The key `config` is optional. See the file `templates/secret-aws.yml` for more info on the Secret contents. | n/a |
| `bitbucket.user` | Name of the Atlantis Bitbucket user. | n/a |
| `bitbucket.token` | Personal access token for the Atlantis Bitbucket user. | n/a |
| `bitbucket.secret` | Webhook secret for Bitbucket repositories (Bitbucket Server only). | n/a |
Expand Down
11 changes: 11 additions & 0 deletions stable/atlantis/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,14 @@ Generates secret-webhook name
{{ template "atlantis.fullname" . }}-webhook
{{- end -}}
{{- end -}}

{{/*
Generates AWS Secret name
*/}}
{{- define "atlantis.awsSecretName" -}}
{{- if .Values.awsSecretName -}}
{{ .Values.awsSecretName }}
{{- else -}}
{{ template "atlantis.fullname" . }}-aws
{{- end -}}
{{- end -}}
6 changes: 3 additions & 3 deletions stable/atlantis/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ spec:
secret:
secretName: {{ template "atlantis.fullname" . }}-gitconfig
{{- end }}
{{- if .Values.aws }}
{{- if or .Values.aws .Values.awsSecretName}}
- name: aws-volume
secret:
secretName: {{ template "atlantis.fullname" . }}-aws
secretName: {{ template "atlantis.awsSecretName" . }}
{{- end }}
{{- if .Values.repoConfig }}
- name: repo-config
Expand Down Expand Up @@ -214,7 +214,7 @@ spec:
readOnly: true
mountPath: /etc/secret-gitconfig
{{- end }}
{{- if .Values.aws}}
{{- if or .Values.aws .Values.awsSecretName}}
- name: aws-volume
readOnly: true
mountPath: /home/atlantis/.aws
Expand Down
2 changes: 2 additions & 0 deletions stable/atlantis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ orgWhitelist: <replace-me>
# [profile a_role_to_assume]
# role_arn = arn:aws:iam::123456789:role/service-role/roleToAssume
# source_profile = default
# To reference an already exsistent Secret object with AWS credentials
wvidana marked this conversation as resolved.
Show resolved Hide resolved
# awsSecretName: 'mysecretwithawscreds'

## To be used for mounting credential files (when using google provider).
serviceAccountSecrets:
Expand Down