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

helm chart: align k8s version label with Values #5773

Merged
merged 7 commits into from
Nov 15, 2023
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
5 changes: 5 additions & 0 deletions operations/helm/charts/grafana-agent/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ internal API changes are not present.
Unreleased
----------

### Enhancements

- Ensure that `app.kubernetes.io/version` label accounts for any
image tag overrides supplied to the chart Values. (@tristanburgess)

0.27.2 (2023-11-07)
----------

Expand Down
6 changes: 3 additions & 3 deletions operations/helm/charts/grafana-agent/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ helm.sh/chart: {{ include "grafana-agent.chart" . }}
app.kubernetes.io/version: "vX.Y.Z"
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- else }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
{{/* substr trims delimeter prefix char from grafana-agent.imageId output
e.g. ':' for tags and '@' for digests. */}}
app.kubernetes.io/version: {{ substr 1 -1 (include "grafana-agent.imageId" .) }}
tristanburgess marked this conversation as resolved.
Show resolved Hide resolved
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{- end }}
Expand Down