diff --git a/projects/helm/helm/CHECKSUMS b/projects/helm/helm/CHECKSUMS index 9d669e00e7..c0c1d418b5 100644 --- a/projects/helm/helm/CHECKSUMS +++ b/projects/helm/helm/CHECKSUMS @@ -1,2 +1,2 @@ -20927c86b3fd83e65ebb83bcc849e5037f2f4ac64cf0047b70731416a0224713 _output/bin/helm/linux-amd64/helm -af6707bc4273a6237d5f7532ed9a960fc91204369aa30499d23903a8d420d284 _output/bin/helm/linux-arm64/helm +da345480912500ca29b03af5e191248e594f43e80155c9d421f0fb94e840dc54 _output/bin/helm/linux-amd64/helm +8ab5b5d854ff1ace5f87ebc57cdc8ff4ca420f8f1143739ef3e2a1aae20f1de1 _output/bin/helm/linux-arm64/helm diff --git a/projects/helm/helm/patches/0001-bug-add-proxy-support-for-oci-getter.patch b/projects/helm/helm/patches/0001-bug-add-proxy-support-for-oci-getter.patch new file mode 100644 index 0000000000..3381224a05 --- /dev/null +++ b/projects/helm/helm/patches/0001-bug-add-proxy-support-for-oci-getter.patch @@ -0,0 +1,27 @@ +From 94c1deae6d5a43491c5a4e8444ecd8273a8122a1 Mon Sep 17 00:00:00 2001 +From: Ricardo Maraschini +Date: Wed, 31 Jan 2024 12:48:22 +0100 +Subject: [PATCH 1/2] bug: add proxy support for oci getter + +adds missing proxy support on oci chart getter. + +Signed-off-by: Ricardo Maraschini +--- + pkg/getter/ocigetter.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go +index 209786bd..0547cdcb 100644 +--- a/pkg/getter/ocigetter.go ++++ b/pkg/getter/ocigetter.go +@@ -119,6 +119,7 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) { + IdleConnTimeout: 90 * time.Second, + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, ++ Proxy: http.ProxyFromEnvironment, + } + }) + +-- +2.40.0 + diff --git a/projects/helm/helm/patches/0002-Set-proxy-in-registry-client.patch b/projects/helm/helm/patches/0002-Set-proxy-in-registry-client.patch new file mode 100644 index 0000000000..588b2c1e01 --- /dev/null +++ b/projects/helm/helm/patches/0002-Set-proxy-in-registry-client.patch @@ -0,0 +1,25 @@ +From 7c2e46274a80f39f5886c9ec3385758e18180764 Mon Sep 17 00:00:00 2001 +From: Ahree Hong +Date: Fri, 29 Mar 2024 18:34:15 -0700 +Subject: [PATCH 2/2] Set proxy in registry client + +Signed-off-by: Ahree Hong +--- + pkg/registry/util.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pkg/registry/util.go b/pkg/registry/util.go +index 8baf0852..2b0dab0c 100644 +--- a/pkg/registry/util.go ++++ b/pkg/registry/util.go +@@ -156,6 +156,7 @@ func NewRegistryClientWithTLS(out io.Writer, certFile, keyFile, caFile string, i + ClientOptHTTPClient(&http.Client{ + Transport: &http.Transport{ + TLSClientConfig: tlsConf, ++ Proxy: http.ProxyFromEnvironment, + }, + }), + ) +-- +2.40.0 +