fix: apply TLS scrape class to all objects #6573
Conversation
Before this change, the TLS configuration from the scrape class wasn't applied to the generated configuration for PodMonitor, ScrapeConfig and Probe objects. Closes prometheus-operator#6556 Signed-off-by: Simon Pasquier <spasquie@redhat.com>
|
@nicolastakashi it looks like we only covered ServiceMonitor in the initial implementation of ScrapeClass... The golden files show that the TLS configuration is now propagated to the final configuration. |
Good catch 👏🏽 |
|
I'm not sure I understand why this bug is happening in the first place. Is it related to this new |
Didn't mean to be a blocker though :) |
|
@ArthurSens the reason was that the MergeTLSConfigWithScrapeClass() function was only called when the SafeTLSConfig field wasn't nil. So it didn't work when the scrape object didn't specify a TLS config. |
|
aaaaaah ok got it! thanks! |
Description
Before this change, the TLS configuration from the scrape class wasn't applied to the generated configuration for PodMonitor, ScrapeConfig and Probe objects.
Closes #6556
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.