[kube-prometheus-stack] apply upgradeJob.labels to all CRD upgrade resources - #7126
Open
dpacgdm wants to merge 2 commits into
Open
[kube-prometheus-stack] apply upgradeJob.labels to all CRD upgrade resources#7126dpacgdm wants to merge 2 commits into
dpacgdm wants to merge 2 commits into
Conversation
dpacgdm
requested review from
GMartinez-Sisti,
QuentinBisson,
Xtigyro,
andrewgkew,
gianrubio,
gkarthiks and
jkroepke
as code owners
July 21, 2026 15:28
dpacgdm
force-pushed
the
fix/crd-upgrade-job-labels-all-resources
branch
2 times, most recently
from
July 21, 2026 15:34
5fe877e to
e1ace47
Compare
…sources upgradeJob.labels were only rendered on the Job. ClusterRole, ClusterRoleBinding, ConfigMap, and ServiceAccount ignored them even though the values comment suggested job-wide labeling. Signed-off-by: dpacgdm <dpac.gdm@gmail.com>
dpacgdm
force-pushed
the
fix/crd-upgrade-job-labels-all-resources
branch
from
July 21, 2026 15:36
e1ace47 to
cf3d563
Compare
Member
|
Does it make sense to put them into |
Author
|
Yes — that would be cleaner. I'll move the shared label set into a |
Move crds.upgradeJob.labels into kube-prometheus-stack.crd.upgradeJob.labels so Job, RBAC, ConfigMap, and ServiceAccount all pick them up from one place. Signed-off-by: dpacgdm <dpac.gdm@gmail.com>
jkroepke
reviewed
Jul 22, 2026
jkroepke
left a comment
jkroepke
left a comment
Member
There was a problem hiding this comment.
Could you please add an helm unittest test case to cover this change. - the PR checklist request this?
| app.kubernetes.io/name: {{ template "kube-prometheus-stack.name" . }}-prometheus-operator | ||
| app.kubernetes.io/component: crds-upgrade | ||
| {{- with .Values.upgradeJob.labels }} | ||
| {{ toYaml . }} |
Member
There was a problem hiding this comment.
Suggested change
| {{ toYaml . }} | |
| {{- toYaml . }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
crds.upgradeJob.labelson ClusterRole, ClusterRoleBinding, ConfigMap, and ServiceAccount (previously only the Job)kube-prometheus-stack.crd.upgradeJob.labelshelper so each upgrade resource includes them from one placeAddresses #7071
Test plan
helm templatewithcrds.upgradeJob.enabled=trueand a customupgradeJob.labelsentry; confirm the label appears on Job + RBAC + SA + ConfigMap