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.

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

align service account labels #222

Merged
merged 3 commits into from Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -11,6 +11,11 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

- Added projected volumes for `capa`

### Changed

- ServiceAccount: Align to upstream ([#222](https://github.com/giantswarm/external-dns-app/pull/222)).
- Labels: Add labels from values.

## [2.21.0] - 2022-12-08

### Added
Expand Down
3 changes: 3 additions & 0 deletions helm/external-dns-app/templates/serviceaccount.yaml
Expand Up @@ -6,6 +6,9 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "external-dns.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if and (or (eq .Values.provider "aws") (eq .Values.provider "capa")) (eq .Values.aws.irsa "true") (eq .Values.aws.access "internal") }}
{{- $_ := 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 "gcp") (.Values.gcpProject) }}
Expand Down
3 changes: 3 additions & 0 deletions helm/external-dns-app/values.schema.json
Expand Up @@ -321,6 +321,9 @@
"create": {
"type": "boolean"
},
"labels": {
"type": "object"
},
"name": {
"type": "string"
}
Expand Down
2 changes: 2 additions & 0 deletions helm/external-dns-app/values.yaml
Expand Up @@ -205,6 +205,8 @@ serviceAccount:
create: true
# Annotations to add to the service account
annotations: {}
# Labels to add to the service account
labels: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""
Expand Down