From 6634f1a9aeedac8fa38aea70c5aa5d3fd5cb6973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=CC=81opold=20Jacquot?= Date: Thu, 24 Jun 2021 15:04:41 +0200 Subject: [PATCH] don't override DefaultClient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bug introduced by https://github.com/fluxcd/flagger/pull/872 Signed-off-by: LeĢopold Jacquot --- pkg/controller/webhook.go | 5 +---- pkg/notifier/client.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/controller/webhook.go b/pkg/controller/webhook.go index a4d577c4..f8182f65 100644 --- a/pkg/controller/webhook.go +++ b/pkg/controller/webhook.go @@ -61,10 +61,7 @@ func callWebhook(webhook string, payload interface{}, timeout string) error { ctx, cancel := context.WithTimeout(req.Context(), t) defer cancel() - httpClient := http.DefaultClient - httpClient.Transport = http.DefaultTransport - - r, err := httpClient.Do(req.WithContext(ctx)) + r, err := http.DefaultClient.Do(req.WithContext(ctx)) if err != nil { return err } diff --git a/pkg/notifier/client.go b/pkg/notifier/client.go index e1cee44e..cdcbb64a 100644 --- a/pkg/notifier/client.go +++ b/pkg/notifier/client.go @@ -30,7 +30,7 @@ import ( ) func postMessage(address string, proxy string, payload interface{}) error { - httpClient := http.DefaultClient + var httpClient = &http.Client{} if proxy != "" { proxyURL, err := url.Parse(proxy)