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

[prometheus-pushgateway] Remove label duplication #3266

Merged

Conversation

KarlisAG
Copy link
Contributor

@KarlisAG KarlisAG commented Apr 19, 2023

What this PR does / why we need it

Remove label duplication from Deployment and StatefulSet, which occurs if podLabels are used. In that case the respective workload pod gets the same label twice because not only is podLabels hardcoded in the workload manifest but also it gets the same labels from prometheus-pushgateway.defaultLabels from _helpers.tpl.
While that mostly is just a nuisance it actually stops and fails HelmRelease in Flux as it is configured to fail if the same label is spotted twice on a resource.

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

Signed-off-by: Karlis Akots Gribulis <karlis.gribulis@gmail.com>
@KarlisAG KarlisAG changed the title Remove label duplication and bump chart [prometheus-pushgateway] Remove label duplication and bump chart Apr 19, 2023
@KarlisAG KarlisAG changed the title [prometheus-pushgateway] Remove label duplication and bump chart [prometheus-pushgateway] Remove label duplication Apr 19, 2023
@zeritti zeritti requested review from zanhsieh and zeritti May 2, 2023 16:12
zanhsieh
zanhsieh previously approved these changes May 4, 2023
zanhsieh and others added 2 commits May 7, 2023 15:38
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
@zeritti zeritti merged commit 4ee82e7 into prometheus-community:main May 8, 2023
4 checks passed
Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request May 16, 2023
…ty#3266)

* Remove label duplication and bump chart

Signed-off-by: Karlis Akots Gribulis <karlis.gribulis@gmail.com>

* Bump version number

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>

---------

Signed-off-by: Karlis Akots Gribulis <karlis.gribulis@gmail.com>
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants