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: Fix KuberenetesSDConfigs in ScrapeConfig #5871

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

slashpai
Copy link
Contributor

Description

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.

I am first testing if e2e test fails for current code and then I will uncomment the fix. Also added unit test missed in feature PR

Fixes #5870

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

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.

Fix KuberenetesSDConfigs in ScrapeConfig

@slashpai
Copy link
Contributor Author

Fixes prometheus-operator#5870

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
@slashpai slashpai changed the title WIP: fix: Fix KuberenetesSDConfigs in ScrapeConfig fix: Fix KuberenetesSDConfigs in ScrapeConfig Aug 31, 2023
@slashpai slashpai marked this pull request as ready for review August 31, 2023 08:03
@slashpai slashpai requested a review from a team as a code owner August 31, 2023 08:03
@@ -241,8 +241,6 @@ func testPromOperatorStartsWithoutScrapeConfigCRD(t *testing.T) {

// testScrapeConfigKubernetesNodeRole tests whether Kubernetes node monitoring works as expected
func testScrapeConfigKubernetesNodeRole(t *testing.T) {
skipPrometheusTests(t)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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 0209080 into prometheus-operator:main Aug 31, 2023
17 checks passed
@slashpai slashpai deleted the fix-k8ssd branch September 9, 2023 04:58
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.

KubernetesSDConfigs not working as expected in ScrapeConfig
2 participants