Skip to content

add(helm): Use commonLabels in chart #4573

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

add(helm): Use commonLabels in chart #4573

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
9 changes: 9 additions & 0 deletions operations/helm/charts/alloy/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ internal API changes are not present.
Unreleased
----------

1.3.1 (2025-10-08)
----------

### Other changes

- Update values to use commonLabels

------------------

Comment on lines +13 to +21
Copy link
Contributor

@kalleep kalleep Oct 9, 2025

Choose a reason for hiding this comment

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

You should not create a new version but put this entry under Unreleased

1.3.0 (2025-09-30)
----------

Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/alloy/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: alloy
description: 'Grafana Alloy'
type: application
version: 1.3.0
version: 1.3.1
appVersion: 'v1.11.0'
icon: https://raw.githubusercontent.com/grafana/alloy/main/docs/sources/assets/alloy_icon_orange.svg

Expand Down
1 change: 1 addition & 0 deletions operations/helm/charts/alloy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ useful if just using the default DaemonSet isn't sufficient.
| controller.podDisruptionBudget.maxUnavailable | string | `nil` | Maximum number of pods that can be unavailable during a disruption. Note: Only one of minAvailable or maxUnavailable should be set. |
| controller.podDisruptionBudget.minAvailable | string | `nil` | Minimum number of pods that must be available during a disruption. Note: Only one of minAvailable or maxUnavailable should be set. |
| controller.podLabels | object | `{}` | Extra pod labels to add. |
| controller.commonLabels | object | `{}` | Add additional label to all resources. |
| controller.priorityClassName | string | `""` | priorityClassName to apply to Grafana Alloy pods. |
| controller.replicas | int | `1` | Number of pods to deploy. Ignored when controller.type is 'daemonset'. |
| controller.terminationGracePeriodSeconds | string | `nil` | Termination grace period in seconds for the Grafana Alloy pods. The default value used by Kubernetes if unspecifed is 30 seconds. |
Expand Down
3 changes: 3 additions & 0 deletions operations/helm/charts/alloy/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ helm.sh/chart: {{ include "alloy.chart" . }}
{{- if index .Values "$chart_tests" }}
app.kubernetes.io/version: "vX.Y.Z"
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.commonLabels }}
{{- toYaml . }}
{{- else -}}
{{/* substr trims delimeter prefix char from alloy.imageId output
e.g. ':' for tags and '@' for digests.
Expand All @@ -63,6 +65,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: alloy
{{- end }}
{{- end }}
{{- end }}

{{/*
Selector labels
Expand Down
3 changes: 3 additions & 0 deletions operations/helm/charts/alloy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@ controller:
# -- Extra labels to add to the controller.
extraLabels: {}

# -- Add additional label to all resources
commonLabels: {}

Comment on lines +204 to +206
Copy link
Contributor

@kalleep kalleep Oct 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This feels like the wrong place to put this, everything else under controller will only affect e.g. daemonset, statefulset etc but this would affect all resources

# -- Annotations to add to controller.
extraAnnotations: {}

Expand Down