Merge pull request #1490 from fluxcd/fix-1485

souleb · web-flow · commit 09575db5ca5d · 2024-06-14T09:01:56.000+02:00
helm: Use the default transport pool to preserve proxy settings
diff --git a/internal/helm/registry/client.go b/internal/helm/registry/client.go
@@ -69,10 +69,10 @@ func newClient(credentialsFile string, tlsConfig *tls.Config, insecureHTTP bool)
 		opts = append(opts, registry.ClientOptPlainHTTP())
 	}
 	if tlsConfig != nil {
+		t := http.DefaultTransport.(*http.Transport).Clone()
+		t.TLSClientConfig = tlsConfig
 		opts = append(opts, registry.ClientOptHTTPClient(&http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsConfig,
-			},
+			Transport: t,
 		}))
 	}
 	if credentialsFile != "" {

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ func newClient(credentialsFile string, tlsConfig *tls.Config, insecureHTTP bool)`
`69`	`69`	`opts = append(opts, registry.ClientOptPlainHTTP())`
`70`	`70`	`}`
`71`	`71`	`if tlsConfig != nil {`
	`72`	`+ t := http.DefaultTransport.(*http.Transport).Clone()`
	`73`	`+ t.TLSClientConfig = tlsConfig`
`72`	`74`	`opts = append(opts, registry.ClientOptHTTPClient(&http.Client{`
`73`		`- Transport: &http.Transport{`
`74`		`- TLSClientConfig: tlsConfig,`
`75`		`- },`
	`75`	`+ Transport: t,`
`76`	`76`	`}))`
`77`	`77`	`}`
`78`	`78`	`if credentialsFile != "" {`