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

helm chart: align k8s version label with Values #5773

Merged
merged 7 commits into from
Nov 15, 2023
Merged

helm chart: align k8s version label with Values #5773

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b2de40
helm chart: align k8s version label with Values
tristanburgess Nov 14, 2023
999b7df
update docs
tristanburgess Nov 14, 2023
f3c6066
revert unneeded chart version bump
tristanburgess Nov 15, 2023
8190380
add comment to denote substr purpose
tristanburgess Nov 15, 2023
cf33a56
update docs
tristanburgess Nov 15, 2023
25e01dd
Merge branch 'main' into tristanburgess/helm-chart-k8s-version-label
tristanburgess Nov 15, 2023
1becf55
Merge branch 'main' into tristanburgess/helm-chart-k8s-version-label
tristanburgess Nov 15, 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: 5 additions & 0 deletions operations/helm/charts/grafana-agent/CHANGELOG.md
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion operations/helm/charts/grafana-agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: grafana-agent
description: 'Grafana Agent'
type: application
version: 0.27.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping this will automatically publish a new chart version. IMHO it's not required straight away, let's leave it as-is.

Otherwise, we'll have to update the CHANGELOG headers to mirror that.

version: 0.27.3
appVersion: 'v0.37.4'

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/grafana-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Grafana Agent Helm chart

![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.27.2](https://img.shields.io/badge/Version-0.27.2-informational?style=flat-square) ![AppVersion: v0.37.4](https://img.shields.io/badge/AppVersion-v0.37.4-informational?style=flat-square)
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.27.3](https://img.shields.io/badge/Version-0.27.3-informational?style=flat-square) ![AppVersion: v0.37.4](https://img.shields.io/badge/AppVersion-v0.37.4-informational?style=flat-square)

Helm chart for deploying [Grafana Agent][] to Kubernetes.

Expand Down
4 changes: 1 addition & 3 deletions operations/helm/charts/grafana-agent/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ 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 }}
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