-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch for insecure proxy support for helm (#3050)
- Loading branch information
Showing
7 changed files
with
59 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v3.14.2 | ||
v3.14.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
projects/helm/helm/patches/0001-bug-add-proxy-support-for-oci-getter.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From 94c1deae6d5a43491c5a4e8444ecd8273a8122a1 Mon Sep 17 00:00:00 2001 | ||
From: Ricardo Maraschini <[email protected]> | ||
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 <[email protected]> | ||
--- | ||
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 | ||
|
25 changes: 25 additions & 0 deletions
25
projects/helm/helm/patches/0002-Set-proxy-in-registry-client.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 7c2e46274a80f39f5886c9ec3385758e18180764 Mon Sep 17 00:00:00 2001 | ||
From: Ahree Hong <[email protected]> | ||
Date: Fri, 29 Mar 2024 18:34:15 -0700 | ||
Subject: [PATCH 2/2] Set proxy in registry client | ||
|
||
Signed-off-by: Ahree Hong <[email protected]> | ||
--- | ||
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 | ||
|