github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-03-11 15:34:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape/discovery/kubernetes: avoid possible panic if given caFile under kubernetes.SDConfig.HTTPClientConfig is not exist (#5243)

Browse source 
follow up d5a599badc
This commit is contained in:
Hui Wang 2023-10-28 02:20:22 +08:00 committed by Aliaksandr Valialkin
parent 20aeb8b65d
commit a37125d043
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/promscrape/discovery/kubernetes/api.go
View file

@ -90,6 +90,10 @@ func newAPIConfig(sdc *SDConfig, baseDir string, swcFunc ScrapeWorkConstructorFu
for strings.HasSuffix(apiServer, "/") { for strings.HasSuffix(apiServer, "/") {
apiServer = apiServer[:len(apiServer)-1] apiServer = apiServer[:len(apiServer)-1]
} }
// pre-check tls config
if _, err := ac.NewTLSConfig(); err != nil {
return nil, fmt.Errorf("cannot initialize tls config: %w", err)
}
aw := newAPIWatcher(apiServer, ac, sdc, swcFunc) aw := newAPIWatcher(apiServer, ac, sdc, swcFunc)
cfg := &apiConfig{ cfg := &apiConfig{
aw: aw, aw: aw,

1
lib/promscrape/discovery/kubernetes/api_watcher.go
View file

@ -234,6 +234,7 @@ func newGroupWatcher(apiServer string, ac *promauth.Config, namespaces []string,
proxy = http.ProxyURL(proxyURL) proxy = http.ProxyURL(proxyURL)
} }
tlsConfig, err := ac.NewTLSConfig() tlsConfig, err := ac.NewTLSConfig()
// we should always check tlsconfig in advance to avoid panic here
if err != nil { if err != nil {
logger.Panicf("FATAL: cannot initialize tls config: %s", err) logger.Panicf("FATAL: cannot initialize tls config: %s", err)
} }