fix: prevent duplicate authentication settings in PodMonitor#7975
Merged
simonpasquier merged 1 commit intoprometheus-operator:mainfrom Oct 7, 2025
Merged
Conversation
This commit ensures that the operator discards PodMonitor resources with duplicate authentication settings. Otherwise Prometheus fails to load the generated configuration. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
3acb029 to
431f734
Compare
slashpai
approved these changes
Oct 6, 2025
51cba2b
into
prometheus-operator:main
29 of 30 checks passed
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/cloudnative-pg
that referenced
this pull request
Oct 21, 2025
See prometheus-operator/prometheus-operator#7975 Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
mnencia
added a commit
to cloudnative-pg/charts
that referenced
this pull request
Nov 10, 2025
After prometheus-operator/prometheus-operator#7975 released in prometheus-operator 0.86.0 the `bearerTokenSecret` is not present anymore in the serialized form unless explicitly set. This patch removes that field from all the PodMonitoring asserts. Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
itay-grudev
pushed a commit
to cloudnative-pg/charts
that referenced
this pull request
Nov 10, 2025
After prometheus-operator/prometheus-operator#7975 released in prometheus-operator 0.86.0 the `bearerTokenSecret` is not present anymore in the serialized form unless explicitly set. This patch removes that field from all the PodMonitoring asserts. Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
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.
Description
This commit ensures that the operator discards PodMonitor resources with duplicate authentication settings. Otherwise Prometheus fails to load the generated configuration.
I'll follow-up with the other resources (e.g. ServiceMonitor).
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Verification
Please check the Prometheus-Operator testing guidelines for recommendations about automated tests.
Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.