Add patch for insecure proxy support for helm (#3050)

aws · Apr 2, 2024 · 2c97cad · 2c97cad
1 parent 1dd53ee
commit 2c97cad
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 7 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -125,7 +125,7 @@ projects:
     repos:
       - name: helm
         versions:
-          - tag: v3.14.2
+          - tag: v3.14.3
             go_version: "1.21"
   - org: kube-vip
     repos:

diff --git a/projects/helm/helm/ATTRIBUTION.txt b/projects/helm/helm/ATTRIBUTION.txt
@@ -1,5 +1,5 @@
 
-** github.com/containerd/containerd; version v1.7.11 --
+** github.com/containerd/containerd; version v1.7.12 --
 https://github.com/containerd/containerd
 
 ** github.com/containerd/log; version v0.1.0 --
@@ -125,7 +125,7 @@ https://github.com/grpc/grpc-go
 ** gopkg.in/yaml.v2; version v2.4.0 --
 https://gopkg.in/yaml.v2
 
-** helm.sh/helm/v3; version v3.14.2 --
+** helm.sh/helm/v3; version v3.14.3 --
 https://github.com/helm/helm
 
 ** k8s.io/api; version v0.29.0 --

diff --git a/projects/helm/helm/CHECKSUMS b/projects/helm/helm/CHECKSUMS
@@ -1,2 +1,2 @@
-8e05189ccec6380a1ae6a53a5790abb59e9b7ae8844eaf6427a9eacc0e70ab4e  _output/bin/helm/linux-amd64/helm
-a314cc7529e940be714d7c1bc43a09efed22c7cf89b33d154cd60e1ae3363bf9  _output/bin/helm/linux-arm64/helm
+6fcb38a6aaaf27492693db5bcf6aefe733931dfb62d4b4bf7878da1768eeb440  _output/bin/helm/linux-amd64/helm
+ce894fb35526d1566fa5361c50dbc981c86f38facd1fe73c5646b5a5090b69aa  _output/bin/helm/linux-arm64/helm
diff --git a/projects/helm/helm/GIT_TAG b/projects/helm/helm/GIT_TAG
@@ -1 +1 @@
-v3.14.2
+v3.14.3
diff --git a/projects/helm/helm/README.md b/projects/helm/helm/README.md
@@ -1,5 +1,5 @@
 ## **Helm**
-![Version](https://img.shields.io/badge/version-v3.14.2-blue)
+![Version](https://img.shields.io/badge/version-v3.14.3-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieVZ2Vm4zalcvTTRlVHk3ODJMLy80a2hqaGw1eUNEMlBEQktYOGxLdkZYQmxMK2tWUTMyUHlxZDVIK2lYak9qM25OZm9IYTFkUGlXZ3dCOEhRb0dHMzBjPSIsIml2UGFyYW1ldGVyU3BlYyI6Im9EemRhdkg1Tll6d1lSaVciLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 [Helm](https://github.com/helm/helm) is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources.

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
@@ -0,0 +1,27 @@
+From 94c1deae6d5a43491c5a4e8444ecd8273a8122a1 Mon Sep 17 00:00:00 2001
+From: Ricardo Maraschini <ricardo.maraschini@gmail.com>
+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 <ricardo.maraschini@gmail.com>
+---
+ 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
@@ -0,0 +1,25 @@
+From 7c2e46274a80f39f5886c9ec3385758e18180764 Mon Sep 17 00:00:00 2001
+From: Ahree Hong <ahreeh@amazon.com>
+Date: Fri, 29 Mar 2024 18:34:15 -0700
+Subject: [PATCH 2/2] Set proxy in registry client
+
+Signed-off-by: Ahree Hong <ahreeh@amazon.com>
+---
+ 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
+