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

add: scrapeConfigSelector check #5941

Merged
merged 1 commit into from Sep 25, 2023

Conversation

nidhey27
Copy link
Contributor

Description

The current Prometheus Operator implementation checks for the presence of spec.serviceMonitorSelector, spec.podMonitorSelector, and spec.probeSelector to determine if the Prometheus configuration should be treated as unmanaged. However, the documentation specifies that the operator should also check for spec.scrapeConfigSelector. This PR aligns the implementation with the documentation by adding the necessary check for spec.scrapeConfigSelector.

Closes #5928

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in 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.)

Changelog entry

Ensure that the operator checks for spec.scrapeConfigSelector when determining if the Prometheus configuration should be treated as unmanaged.

Signed-off-by: nidhey27 <nidhey.indurkar@infracloud.io>
@nidhey27 nidhey27 requested a review from a team as a code owner September 25, 2023 09:27
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@simonpasquier simonpasquier merged commit 272df8a into prometheus-operator:main Sep 25, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Specifying only scrapeConfigSelector breaks the deployment of Prometheus
2 participants