mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

Merge pull request from simonpasquier/fix-proxy-url-version-check

Browse source 
fix: allow proxy URL for all Prometheus versions
This commit is contained in:
Jayapriya Pai 2024-08-19 10:38:28 +05:30 • committed by GitHub
commit d78591c744
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions

6
pkg/prometheus/promcfg.go
View file

@ -578,12 +578,12 @@ func (cg *ConfigGenerator) addProxyConfigtoYaml(
return cfg
}
var cgProxyConfig = cg.WithMinimumVersion("2.43.0")
if proxyConfig.ProxyURL != nil {
cfg = cgProxyConfig.AppendMapItem(cfg, "proxy_url", *proxyConfig.ProxyURL)
cfg = cg.AppendMapItem(cfg, "proxy_url", *proxyConfig.ProxyURL)
}
cgProxyConfig := cg.WithMinimumVersion("2.43.0")
if proxyConfig.NoProxy != nil {
cfg = cgProxyConfig.AppendMapItem(cfg, "no_proxy", *proxyConfig.NoProxy)
}

1
pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsIncompatiblePrometheusVersion.golden generated vendored
View file

@ -6,6 +6,7 @@ global:
prometheus_replica: $(POD_NAME)
scrape_configs:
- job_name: scrapeConfig/default/testscrapeconfig1
proxy_url: http://no-proxy.com
relabel_configs:
- source_labels:
- job