Skip to content

Commit 2c97cad

Browse files
authored
Add patch for insecure proxy support for helm (#3050)
1 parent 1dd53ee commit 2c97cad

7 files changed

+59
-7
lines changed

UPSTREAM_PROJECTS.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ projects:
125125
repos:
126126
- name: helm
127127
versions:
128-
- tag: v3.14.2
128+
- tag: v3.14.3
129129
go_version: "1.21"
130130
- org: kube-vip
131131
repos:

projects/helm/helm/ATTRIBUTION.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
** github.com/containerd/containerd; version v1.7.11 --
2+
** github.com/containerd/containerd; version v1.7.12 --
33
https://github.com/containerd/containerd
44

55
** github.com/containerd/log; version v0.1.0 --
@@ -125,7 +125,7 @@ https://github.com/grpc/grpc-go
125125
** gopkg.in/yaml.v2; version v2.4.0 --
126126
https://gopkg.in/yaml.v2
127127

128-
** helm.sh/helm/v3; version v3.14.2 --
128+
** helm.sh/helm/v3; version v3.14.3 --
129129
https://github.com/helm/helm
130130

131131
** k8s.io/api; version v0.29.0 --

projects/helm/helm/CHECKSUMS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
8e05189ccec6380a1ae6a53a5790abb59e9b7ae8844eaf6427a9eacc0e70ab4e _output/bin/helm/linux-amd64/helm
2-
a314cc7529e940be714d7c1bc43a09efed22c7cf89b33d154cd60e1ae3363bf9 _output/bin/helm/linux-arm64/helm
1+
6fcb38a6aaaf27492693db5bcf6aefe733931dfb62d4b4bf7878da1768eeb440 _output/bin/helm/linux-amd64/helm
2+
ce894fb35526d1566fa5361c50dbc981c86f38facd1fe73c5646b5a5090b69aa _output/bin/helm/linux-arm64/helm

projects/helm/helm/GIT_TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.14.2
1+
v3.14.3

projects/helm/helm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## **Helm**
2-
![Version](https://img.shields.io/badge/version-v3.14.2-blue)
2+
![Version](https://img.shields.io/badge/version-v3.14.3-blue)
33
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieVZ2Vm4zalcvTTRlVHk3ODJMLy80a2hqaGw1eUNEMlBEQktYOGxLdkZYQmxMK2tWUTMyUHlxZDVIK2lYak9qM25OZm9IYTFkUGlXZ3dCOEhRb0dHMzBjPSIsIml2UGFyYW1ldGVyU3BlYyI6Im9EemRhdkg1Tll6d1lSaVciLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
44

55
[Helm](https://github.com/helm/helm) is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 94c1deae6d5a43491c5a4e8444ecd8273a8122a1 Mon Sep 17 00:00:00 2001
2+
From: Ricardo Maraschini <[email protected]>
3+
Date: Wed, 31 Jan 2024 12:48:22 +0100
4+
Subject: [PATCH 1/2] bug: add proxy support for oci getter
5+
6+
adds missing proxy support on oci chart getter.
7+
8+
Signed-off-by: Ricardo Maraschini <[email protected]>
9+
---
10+
pkg/getter/ocigetter.go | 1 +
11+
1 file changed, 1 insertion(+)
12+
13+
diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go
14+
index 209786bd..0547cdcb 100644
15+
--- a/pkg/getter/ocigetter.go
16+
+++ b/pkg/getter/ocigetter.go
17+
@@ -119,6 +119,7 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
18+
IdleConnTimeout: 90 * time.Second,
19+
TLSHandshakeTimeout: 10 * time.Second,
20+
ExpectContinueTimeout: 1 * time.Second,
21+
+ Proxy: http.ProxyFromEnvironment,
22+
}
23+
})
24+
25+
--
26+
2.40.0
27+
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 7c2e46274a80f39f5886c9ec3385758e18180764 Mon Sep 17 00:00:00 2001
2+
From: Ahree Hong <[email protected]>
3+
Date: Fri, 29 Mar 2024 18:34:15 -0700
4+
Subject: [PATCH 2/2] Set proxy in registry client
5+
6+
Signed-off-by: Ahree Hong <[email protected]>
7+
---
8+
pkg/registry/util.go | 1 +
9+
1 file changed, 1 insertion(+)
10+
11+
diff --git a/pkg/registry/util.go b/pkg/registry/util.go
12+
index 8baf0852..2b0dab0c 100644
13+
--- a/pkg/registry/util.go
14+
+++ b/pkg/registry/util.go
15+
@@ -156,6 +156,7 @@ func NewRegistryClientWithTLS(out io.Writer, certFile, keyFile, caFile string, i
16+
ClientOptHTTPClient(&http.Client{
17+
Transport: &http.Transport{
18+
TLSClientConfig: tlsConf,
19+
+ Proxy: http.ProxyFromEnvironment,
20+
},
21+
}),
22+
)
23+
--
24+
2.40.0
25+

0 commit comments

Comments
 (0)