feat(helm): Make helm labels more specific for antiaffinity #17405

MaoMaoCake · 2025-04-23T08:15:34Z

What this PR does / why we need it:
Makes the labels for loki pods more specific so as to not cause issues when using with mimir.

Which issue(s) this PR fixes:
Fixes #17404

Special notes for your reviewer:

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added
Tests updated
Title matches the required conventional commits format, see here
- Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

updates values to use the new labels Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

CLAassistant · 2025-04-23T08:15:41Z

All committers have signed the CLA.

jkroepke

Please check my comments.

production/helm/loki/templates/backend/_helpers-backend.tpl

jkroepke · 2025-07-08T17:02:07Z

production/helm/loki/values.yaml

+              app.kubernetes.io/instance: loki
+              app.kubernetes.io/name: loki


Suggested change

app.kubernetes.io/instance: loki

app.kubernetes.io/name: loki

app.kubernetes.io/name: '{{ include "loki.name" . }}'

app.kubernetes.io/instance: '{{ .Release.Name }}'

this would match

loki/production/helm/loki/templates/_helpers.tpl

Lines 139 to 145 in a091428

{{/*

Selector labels

*/}}

{{- define "loki.selectorLabels" -}}

app.kubernetes.io/name: {{ include "loki.name" . }}

app.kubernetes.io/instance: {{ .Release.Name }}

{{- end }}

But affinity need to be pass trough the helm tpl function everywhere, which is fine to solve this case in idiomatic way.

Ill make this change would you prefer I made a new pull request without the _helpers-xxx changes?

Can you modify this existing here, if you wish. both is fine.

@jkroepke - I've made the change I think you've asked for here:
#19061

This commit allows templating in the affinity and topology spread constraints, and updates the values to be more specific about the app.kubernetes.io/instance and app.kubernetes.io/name kubernetes recommended label. When deploying into a cluster with a low number of nodes, or a cluster with the app.kubernetes.io/component label already used extensively, you cannot place these pods. If we want them to be scheduled apart, we should be more specific with the label selector. This follows on from the draft PR grafana#17405

…grafana#17404) This commit allows templating in the affinity and topology spread constraints, and updates the values to be more specific about the app.kubernetes.io/instance and app.kubernetes.io/name kubernetes recommended label. When deploying into a cluster with a low number of nodes, or a cluster with the app.kubernetes.io/component label already used extensively, you cannot place these pods. If we want them to be scheduled apart, we should be more specific with the label selector. This follows on from the draft PR grafana#17405

grafana#17404) This commit allows templating in the affinity and topology spread constraints, and updates the values to be more specific about the app.kubernetes.io/instance and app.kubernetes.io/name kubernetes recommended label. When deploying into a cluster with a low number of nodes, or a cluster with the app.kubernetes.io/component label already used extensively, you cannot place these pods. If we want them to be scheduled apart, we should be more specific with the label selector. This follows on from the draft PR grafana#17405

MaoMaoCake added 22 commits April 23, 2025 14:56

Update _helpers-ingester.tpl

7c0bb63

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update values.yaml

90df39c

updates values to use the new labels Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-backend.tpl

5b39ef4

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-bloom-builder.tpl

4bc828d

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-bloom-gateway.tpl

4351340

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-bloom-planner.tpl

d7224c0

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-compactor.tpl

a87b576

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-distributor.tpl

ae3b3b0

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-gateway.tpl

eb2ce16

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-index-gateway.tpl

c7b292d

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers.tpl

4d8948b

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-pattern-ingester.tpl

0ba737d

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-querier.tpl

6b1ebbb

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-query-frontend.tpl

a71da15

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-query-scheduler.tpl

70999af

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-read.tpl

349e650

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-ruler.tpl

6da921a

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-single-binary.tpl

76bb347

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-table-manager.tpl

edefc05

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers-write.tpl

2074277

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers.yaml

09734d4

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

Update _helpers.yaml

aba255b

Signed-off-by: Jirapong Pansak <55589246+MaoMaoCake@users.noreply.github.com>

MaoMaoCake requested a review from a team as a code owner April 23, 2025 08:15

pull-request-size bot added the size/M label Apr 23, 2025

github-actions bot added the area/helm label Apr 23, 2025

jkroepke reviewed Jul 8, 2025

View reviewed changes

TomHellier mentioned this pull request Aug 29, 2025

feat(helm): add more specificity to affinity and topology spread constraints (#17404) #19061

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(helm): Make helm labels more specific for antiaffinity #17405

feat(helm): Make helm labels more specific for antiaffinity #17405

Uh oh!

MaoMaoCake commented Apr 23, 2025 •

edited

Loading

Uh oh!

CLAassistant commented Apr 23, 2025 •

edited

Loading

Uh oh!

jkroepke left a comment

Uh oh!

Uh oh!

jkroepke Jul 8, 2025

Uh oh!

MaoMaoCake Jul 9, 2025

Uh oh!

jkroepke Jul 9, 2025 •

edited

Loading

Uh oh!

TomHellier Aug 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		app.kubernetes.io/instance: loki
		app.kubernetes.io/name: loki

	{{/*
	Selector labels
	*/}}
	{{- define "loki.selectorLabels" -}}
	app.kubernetes.io/name: {{ include "loki.name" . }}
	app.kubernetes.io/instance: {{ .Release.Name }}
	{{- end }}

feat(helm): Make helm labels more specific for antiaffinity #17405

Are you sure you want to change the base?

feat(helm): Make helm labels more specific for antiaffinity #17405

Uh oh!

Conversation

MaoMaoCake commented Apr 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CLAassistant commented Apr 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jkroepke left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jkroepke Jul 8, 2025

Choose a reason for hiding this comment

Uh oh!

MaoMaoCake Jul 9, 2025

Choose a reason for hiding this comment

Uh oh!

jkroepke Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TomHellier Aug 29, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MaoMaoCake commented Apr 23, 2025 •

edited

Loading

CLAassistant commented Apr 23, 2025 •

edited

Loading

jkroepke Jul 9, 2025 •

edited

Loading