Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: service account for capa and aws provider on irsa #230

Merged
merged 9 commits into from
Jan 13, 2023
Merged

Update: service account for capa and aws provider on irsa #230

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18cff01
Update: service account for capa and aws provider on irsa
zewolfe Jan 10, 2023
5463d7f
Update: CHANGELOG.md
zewolfe Jan 10, 2023
520a830
Merge branch 'master' into update-sa-for-irsa
zewolfe Jan 10, 2023
fb44bb9
Chore: clean up unused account id value
zewolfe Jan 10, 2023
f38357b
Merge branch 'update-sa-for-irsa' of github.com:giantswarm/external-d…
zewolfe Jan 10, 2023
8cc2833
Update: split sa annotation for aws and capa
zewolfe Jan 11, 2023
738e830
Update helm/external-dns-app/templates/_helpers.tpl
zewolfe Jan 12, 2023
f900ca7
Update: split sa annotation for aws and capa
zewolfe Jan 12, 2023
a4f5426
Remove empty lines.
Gacko Jan 12, 2023
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Changed

### Changed

- Service account `irsa` annotation for `aws` and `capa` to align with `aws-pod-identity-webhook-app` changes
- Deployment: Align to upstream ([#227](https://github.com/giantswarm/external-dns-app/pull/227) [#229](https://github.com/giantswarm/external-dns-app/pull/229)).
- Template deployment strategy from values
- Align indentation
Expand All @@ -18,6 +20,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
- Add secret's mount subpath
- Take securityContext from values


## [2.22.0] - 2023-01-02

### Added
Expand Down
4 changes: 3 additions & 1 deletion helm/external-dns-app/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,10 @@ Set Giant Swarm podAnnotations.
Set Giant Swarm serviceAccountAnnotations.
*/}}
{{- define "giantswarm.serviceAccountAnnotations" -}}
{{- if and (or (eq .Values.provider "aws") (eq .Values.provider "capa")) (eq .Values.aws.irsa "true") (eq .Values.aws.access "internal") (not (hasKey .Values.serviceAccount.annotations "eks.amazonaws.com/role-arn")) }}
{{- if and (eq .Values.provider "aws") (eq .Values.aws.irsa "true") (eq .Values.aws.access "internal") (not (hasKey .Values.serviceAccount.annotations "eks.amazonaws.com/role-arn")) }}
{{- $_ := set .Values.serviceAccount.annotations "eks.amazonaws.com/role-arn" (tpl "arn:aws:iam::{{ .Values.aws.accountID }}:role/{{ template \"aws.iam.role\" . }}" .) }}
{{- else if and (eq .Values.provider "capa") (eq .Values.aws.access "internal") (not (hasKey .Values.serviceAccount.annotations "eks.amazonaws.com/role-arn")) }}
{{- $_ := set .Values.serviceAccount.annotations "eks.amazonaws.com/role-arn" (include "aws.iam.role" .) }}
{{- else if and (eq .Values.provider "gcp") (.Values.gcpProject) (not (hasKey .Values.serviceAccount.annotations "giantswarm.io/gcp-service-account")) }}
{{- $_ := set .Values.serviceAccount.annotations "giantswarm.io/gcp-service-account" (tpl "external-dns-app@{{ .Values.gcpProject }}.iam.gserviceaccount.com" .) }}
{{- end }}
Expand Down