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: ScrapeClass TLSConfig nil pointer exception (#6507) #6526

Merged

Conversation

simonpasquier
Copy link
Contributor

@simonpasquier simonpasquier commented Apr 18, 2024

Description

Cherry-pick of #6507

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.)

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.

[BUGFIX] Fix ScrapeClass TLSConfig nil pointer panic when only relabeling is configured.

@simonpasquier simonpasquier requested a review from a team as a code owner April 18, 2024 08:28
@slashpai
Copy link
Contributor

shouldn't this be to release-0.73 branch as #6507 was to main?

@slashpai
Copy link
Contributor

But how the diff came since it was already merged to main? 🤔

@simonpasquier simonpasquier changed the base branch from main to release-0.73 April 18, 2024 09:01
@simonpasquier
Copy link
Contributor Author

@slashpai good catch! I've switched the base but not sure about the diff before.

@simonpasquier simonpasquier merged commit af00f92 into prometheus-operator:release-0.73 Apr 18, 2024
17 checks passed
@simonpasquier simonpasquier deleted the cherry-pick-6507 branch April 18, 2024 12:13
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.

None yet

3 participants