Skip to content

Chart: opt-in service account and pod labels (backport to r8.0) #305

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

Merged
MusaMisto merged 1 commit into from
Sep 13, 2026
Merged

Chart: opt-in service account and pod labels (backport to r8.0) #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions charts/default/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,5 @@ concerns.
|-----|---------|-------------|
| `service.type` | `ClusterIP` | Service type. |
| `service.port` | `80` | Service port (also the default `HTTPRoute` backend port). |
| `serviceAccount.name` | `''` | Existing ServiceAccount the pod runs as, e.g. one bound to an Azure Workload Identity. Empty renders no `serviceAccountName`. The chart does not create it. |
| `podLabels` | `{}` | Extra labels on the pod template only, never the selector. Values render as strings, e.g. `--set 'podLabels.azure\.workload\.identity/use=true'`. `app`, `draft` and `release` are set by the chart and can't be overridden. |
9 changes: 9 additions & 0 deletions charts/default/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,18 @@ spec:
app: {{ template "project.name" . }}
draft: {{ .Values.draft | default "draft-app" }}
release: {{ .Release.Name }}
{{- range $key, $value := .Values.podLabels }}
{{- if has $key (list "app" "draft" "release") }}
{{- fail (printf "podLabels.%s is set by the chart and can't be overridden" $key) }}
{{- end }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
buildID: {{ .Values.buildID | default "" | quote }}
spec:
{{- with .Values.serviceAccount.name }}
serviceAccountName: {{ . | quote }}
{{- end }}
{{- if .Values.hostAliases }}
hostAliases:
{{- range .Values.hostAliases }}
Expand Down
11 changes: 11 additions & 0 deletions charts/default/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ tolerations: []

affinity: {}

# Existing ServiceAccount for the pod to run as, e.g. one bound to an Azure Workload Identity.
# Empty (default) renders no serviceAccountName, so the namespace's default ServiceAccount is used.
# The chart does not create the ServiceAccount.
serviceAccount:
name: ''

# Extra labels on the pod template only, never the selector. Values always render as strings.
# app, draft and release are set by the chart and can't be overridden.
# e.g. --set 'podLabels.azure\.workload\.identity/use=true'
podLabels: {}

# db is the connection string for the database
db: ""

Expand Down
Loading