Skip to content

feat(helm): allow setting labels for ingesters #18536

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
merged 6 commits into from
Jul 29, 2025
Merged

feat(helm): allow setting labels for ingesters #18536

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e57b86
Feat(helm): allow setting labels for ingesters
meinenec Jul 22, 2025
77039a4
Update production/helm/loki/CHANGELOG.md
meinenec Jul 23, 2025
8d01a7a
fix(helm): Set loki.ingester.labels in values.yaml
meinenec Jul 23, 2025
ec31098
Merge branch 'main' of https://github.com/grafana/loki
meinenec Jul 24, 2025
40ddb31
Merge branch 'main' into main
JStickler Jul 28, 2025
f8b8030
Merge branch 'main' into main
Jayclifford345 Jul 29, 2025
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
1 change: 1 addition & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5641,6 +5641,7 @@ null
"tag": null
},
"initContainers": [],
"labels": {},
"lifecycle": {},
"livenessProbe": {},
"maxUnavailable": 1,
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Entries should be ordered as follows:
Entries should include a reference to the pull request that introduced the change.

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
- [FEATURE] Allow setting custom labels for ingester statefulsets [#18536](https://github.com/grafana/loki/pull/18536)
## 6.33.0

- [FEATURE] Allow passing tenant password hash instead of password. [#17049](https://github.com/grafana/loki/pull/17049)
Expand All @@ -24,7 +25,6 @@ Entries should include a reference to the pull request that introduced the chang
- [BUGFIX] Add release namespace metadata to HorizontalPodAutoscaling that lack it. [#18453](https://github.com/grafana/loki/pull/18453)
- [BUGFIX] Move loki-sc-rules container from first location in `containers` to second to avoid it being selected as the default for `kubectl logs` or `kubectl exec`. [#17937](https://github.com/grafana/loki/pull/17937)
- [FEATURE] Added support for chunk-cache-l2 [#17556](https://github.com/grafana/loki/pull/17556)
- [ENHANCEMENT] Add FOLDER_ANNOTATATION logic for sidecar container. [#13289](https://github.com/grafana/loki/pull/13289)
Copy link
Contributor

@jkroepke jkroepke Jul 24, 2025

Choose a reason for hiding this comment

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

this is fine, (dup of line 20)

Copy link
Contributor Author

@meinenec meinenec Jul 24, 2025

Choose a reason for hiding this comment

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

I seem to have caused some hiccups rebasing my fork. Let me know and I can revert this - otherwise I'll leave as-is to keep the review moving.


## 6.32.0

Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-a
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with .Values.ingester.labels }}
Copy link
Contributor

@jkroepke jkroepke Jul 23, 2025

Choose a reason for hiding this comment

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

Please add labels: {} to the values.yaml and run make helm-docs

Copy link
Contributor Author

@meinenec meinenec Jul 23, 2025

Choose a reason for hiding this comment

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

Apologies and added! Thanks for looking

{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}"
{{- with .Values.loki.annotations }}
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-b
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with .Values.ingester.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}"
{{- with .Values.loki.annotations }}
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
app.kubernetes.io/part-of: memberlist
name: {{ include "loki.prefixIngesterName" . }}ingester-zone-c
rollout-group: {{ include "loki.prefixRolloutGroup" . }}ingester
{{- with .Values.ingester.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
rollout-max-unavailable: "{{ include "loki.ingester.maxUnavailable" (dict "ctx" . "replicas" $replicas)}}"
{{- with .Values.loki.annotations }}
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/templates/ingester/statefulset-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
labels:
{{- include "loki.ingesterLabels" . | nindent 4 }}
app.kubernetes.io/part-of: memberlist
{{- with .Values.ingester.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.loki.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,7 @@ ingester:
tag: null
# -- Command to execute instead of defined in Docker image
command: null
labels: {}
priorityClassName: null
# -- Labels for ingester pods
podLabels: {}
Expand Down
Loading