Skip to content

feat: allows Probes to configure HTTP settings#8461

Merged
simonpasquier merged 1 commit intoprometheus-operator:release-0.90from
multani:probe-http-config
Mar 24, 2026
Merged

feat: allows Probes to configure HTTP settings#8461
simonpasquier merged 1 commit intoprometheus-operator:release-0.90from
multani:probe-http-config

Conversation

@multani
Copy link
Copy Markdown
Contributor

@multani multani commented Mar 24, 2026

Description

In #8112, the code was changed to unify the HTTP configuration, but the configuration was never applied to probes. For instance, changing the HTTP configuration to use HTTP 1.1 instead of HTTP 2.0 was not correctly applied.

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

The new test shows the configuration with one of the HTTP config flag set, and correctly generated by the Operator.

Changelog entry

Make the HTTP configuration available to Probes

Comment on lines -1810 to -1811
cfg = cg.addTLStoYaml(cfg, s, mergeSafeTLSConfigWithScrapeClass(m.Spec.TLSConfig, scrapeClass))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is done by addHTTPConfigToYAML already.

@multani multani marked this pull request as ready for review March 24, 2026 09:14
@multani multani requested a review from a team as a code owner March 24, 2026 09:14
@simonpasquier
Copy link
Copy Markdown
Contributor

Good catch! It might even warrant a v0.90.1 patch release. Can you submit the PR against the release-0.90 branch?

@multani multani changed the base branch from main to release-0.90 March 24, 2026 10:40
@pull-request-size pull-request-size bot added size/L and removed size/M labels Mar 24, 2026
@multani
Copy link
Copy Markdown
Contributor Author

multani commented Mar 24, 2026

I changed the base of the PR, I'll rebase my commit on top of this branch as well.

Signed-off-by: Jonathan Ballet <jon@multani.info>
@multani
Copy link
Copy Markdown
Contributor Author

multani commented Mar 24, 2026

It might even warrant a v0.90.1 patch release. Can you submit the PR against the release-0.90 branch?

Done ✔️

Good catch!

FYI, I only took a quick look at the other generator in this file, and it seems they are similar but also all slightly different ; maybe another pass over the configuration could help to have the same behavior applied everywhere.

Copy link
Copy Markdown
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 enabled auto-merge March 24, 2026 11:25
@simonpasquier
Copy link
Copy Markdown
Contributor

FYI, I only took a quick look at the other generator in this file, and it seems they are similar but also all slightly different ; maybe another pass over the configuration could help to have the same behavior applied everywhere.

I'm less worried about ServiceMonitor and PodMonitor which have more test coverage in general but yes it might be worth to verify.

@simonpasquier simonpasquier disabled auto-merge March 24, 2026 11:37
@simonpasquier simonpasquier merged commit 3d9d543 into prometheus-operator:release-0.90 Mar 24, 2026
22 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.

2 participants