From aafd77f3d13ec770e4880dbaa9ab28a6dc657af9 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 22 Jul 2024 14:37:28 -0600 Subject: [PATCH 1/2] fix: use http.DefaultClient to read proxy env vars Signed-off-by: Tyler Gillson --- internal/sinks/sink.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/sinks/sink.go b/internal/sinks/sink.go index 347212ec..65a61988 100644 --- a/internal/sinks/sink.go +++ b/internal/sinks/sink.go @@ -40,9 +40,8 @@ type Client struct { // NewClient returns a new Client with the provided timeout. func NewClient(timeout time.Duration) *Client { - client := &http.Client{ - Timeout: timeout, - } + client := http.DefaultClient // inherit http.ProxyFromEnvironment + client.Timeout = timeout return &Client{ hclient: client, } From 5c96fd2536a7ec8f7a42074494d6749cfd295f74 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 22 Jul 2024 14:38:01 -0600 Subject: [PATCH 2/2] refactor: use empty pool rather than failing if system cert load fails Signed-off-by: Tyler Gillson --- internal/sinks/alertmanager.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/sinks/alertmanager.go b/internal/sinks/alertmanager.go index 439989e4..53f2cf5f 100644 --- a/internal/sinks/alertmanager.go +++ b/internal/sinks/alertmanager.go @@ -84,7 +84,8 @@ func (s *AlertmanagerSink) Configure(c Client, config map[string][]byte) error { if ok { caCertPool, err = x509.SystemCertPool() if err != nil { - return errors.Wrap(err, "invalid Alertmanager config: failed to get system cert pool") + s.log.Error(err, "failed to get system cert pool; using empty pool") + caCertPool = x509.NewCertPool() } caCertPool.AppendCertsFromPEM(caCert) }