Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.4.2
version: 1.4.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
14 changes: 14 additions & 0 deletions chart/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,20 @@ app.kubernetes.io/name: {{ include "keess.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Pod template labels: the selector labels plus anything in .Values.podLabels.

Merged into one map rather than emitted as two blocks, so the rendered manifest
can never contain a duplicate key. `merge` gives the destination precedence, so
the selector labels win on collision -- a podLabels entry overriding
`app.kubernetes.io/name` or `app.kubernetes.io/instance` would otherwise stop the
Pod from matching the Deployment's immutable selector.
*/}}
{{- define "keess.podLabels" -}}
{{- $selectorLabels := include "keess.selectorLabels" . | fromYaml -}}
{{- toYaml (merge $selectorLabels (deepCopy (.Values.podLabels | default dict))) }}
{{- end }}

{{/*
Build an image reference. A tag starting with "@" is treated as a digest pin
and joined without a colon (repository@sha256:...); otherwise it is a normal tag.
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "keess.selectorLabels" . | nindent 8 }}
{{- include "keess.podLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
7 changes: 7 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ serviceAccount:

podAnnotations: {}

# Extra labels applied to the Pod template only, not to the Deployment. Useful
# for telemetry agents that select or tag workloads by Pod label
#
# The chart's selector labels take precedence, so nothing set here can desync
# the Pod from the Deployment's immutable selector.
podLabels: {}

podSecurityContext: {}
# fsGroup: 2000

Expand Down