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

fix(helm): allow setting pod labels #1649

Merged
merged 1 commit into from
Aug 27, 2024
Merged

fix(helm): allow setting pod labels #1649

merged 1 commit into from
Aug 27, 2024

Conversation

pharaujo
Copy link
Contributor

@pharaujo pharaujo commented Aug 26, 2024

Since #1538 landed, it's not possible to set additional pod labels. The only way of setting pod labels would be to change
grafana-operator.selectorLabels, but doing that breaks current deployments as selector labels are immutable.

grafana-operator.labels includes grafana-operator.selectorLabels, so it's safe to include them instead in the pod labels, and doing so fixes the current issue without causing side-effects as well as restores previous chart behavior.

This is the alternative fix discussed in PR #1560

fixes #1546 #1642

Since #1538 landed, it's not possible to set additional pod labels. The
only way of setting pod labels would be to change
`grafana-operator.selectorLabels`, but doing that breaks current
deployments as selector labels are immutable.

`grafana-operator.labels` includes `grafana-operator.selectorLabels`, so
it's safe to include them instead in the pod labels, and doing so fixes
the current issue without causing side-effects.

fixes #1546 #1642
@CLAassistant
Copy link

CLAassistant commented Aug 26, 2024

CLA assistant check
All committers have signed the CLA.

@NissesSenap
Copy link
Collaborator

LGTM, as pointed out since selectorLabels is included in labels , this should solve the issue.

Thanks for the work around this @pharaujo

@NissesSenap NissesSenap added this pull request to the merge queue Aug 27, 2024
Merged via the queue into grafana:master with commit fa909e1 Aug 27, 2024
14 checks passed
@pharaujo pharaujo deleted the fix/pod_labels branch August 27, 2024 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants