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.

Sign up for GitHub

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

Jump to bottom

operator: Use enableHttp2 field as boolean in libsonnet templates #2724

Merged
merged 2 commits into from
Jan 11, 2023
Merged

operator: Use enableHttp2 field as boolean in libsonnet templates #2724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85639a
operator: Use enableHttp2 field as boolean in pod_monitor and service…
tpaschalis Jan 11, 2023
7f2780d
Add CHANGELOG entry
tpaschalis Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ Main (unreleased)
seconds per file to finish flushing read logs to the client, after which it
will drop them, resulting in losing logs. (@rfratto)

- Operator: Fix the handling of the enableHttp2 field as a boolean in
`pod_monitor` and `service_monitor` templates. (@tpaschalis)

### Other changes

- Use Go 1.19.4 for builds. (@erikbaranowski)
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/config/templates/component/metrics/pod_monitor.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function(
proxy_url: optionals.string(endpoint.ProxyURL),
params: optionals.object(endpoint.Params),
scheme: optionals.string(endpoint.Scheme),
enable_http2: optionals.string(endpoint.EnableHttp2),
enable_http2: optionals.bool(endpoint.EnableHttp2),

// NOTE(rfratto): unlike ServiceMonitor, pod monitors explicitly use
// SafeTLSConfig.
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/config/templates/component/metrics/service_monitor.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function(
proxy_url: optionals.string(endpoint.ProxyURL),
params: optionals.object(endpoint.Params),
scheme: optionals.string(endpoint.Scheme),
enable_http2: optionals.string(endpoint.EnableHttp2),
enable_http2: optionals.bool(endpoint.EnableHttp2),

tls_config:
if endpoint.TLSConfig != null then new_tls_config(meta.Namespace, endpoint.TLSConfig),
Expand Down