Skip to content

Commit b28669e

Browse files
hiddecoPaulo Gomes
authored andcommitted
Update to patched version of Helm 3.8.0
This commit updates to a version of Helm 3.8.0, with patches applied to deal with memory leak and HTTP transport issues. The latter being described in #578. Signed-off-by: Hidde Beydals <[email protected]>
1 parent a4012f2 commit b28669e

File tree

2 files changed

+110
-39
lines changed

2 files changed

+110
-39
lines changed

go.mod

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
cloud.google.com/go/storage v1.16.0
99
github.com/Masterminds/semver/v3 v3.1.1
1010
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
11-
github.com/cyphar/filepath-securejoin v0.2.2
11+
github.com/cyphar/filepath-securejoin v0.2.3
1212
github.com/darkowlzz/controller-check v0.0.0-20220119215126-648356cef22c
1313
github.com/docker/go-units v0.4.0
1414
github.com/elazarl/goproxy v0.0.0-20211114080932-d06c3be7c11b
@@ -36,7 +36,7 @@ require (
3636
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
3737
google.golang.org/api v0.62.0
3838
gotest.tools v2.2.0+incompatible
39-
helm.sh/helm/v3 v3.7.2
39+
helm.sh/helm/v3 v3.8.0
4040
k8s.io/api v0.23.3
4141
k8s.io/apimachinery v0.23.3
4242
k8s.io/client-go v0.23.3
@@ -46,16 +46,21 @@ require (
4646
sigs.k8s.io/yaml v1.3.0
4747
)
4848

49+
// Temporary fork of Helm v3.8.0 with patch applied from
50+
// https://github.com/helm/helm/pull/10568 to solve
51+
// https://github.com/fluxcd/source-controller/issues/578.
52+
// TODO: Remove once Helm version with patch is released.
53+
replace helm.sh/helm/v3 v3.8.0 => github.com/hiddeco/helm/v3 v3.8.1-0.20220223115530-53489c50c9e7
54+
4955
require (
5056
cloud.google.com/go v0.99.0 // indirect
5157
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
52-
github.com/BurntSushi/toml v0.3.1 // indirect
58+
github.com/BurntSushi/toml v0.4.1 // indirect
5359
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
5460
github.com/Masterminds/goutils v1.1.1 // indirect
5561
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
5662
github.com/Masterminds/squirrel v1.5.2 // indirect
5763
github.com/Microsoft/go-winio v0.5.2 // indirect
58-
github.com/Microsoft/hcsshim v0.8.23 // indirect
5964
github.com/PuerkitoBio/purell v1.1.1 // indirect
6065
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
6166
github.com/acomagu/bufpipe v1.0.3 // indirect
@@ -66,13 +71,12 @@ require (
6671
github.com/bugsnag/panicwrap v1.3.4 // indirect
6772
github.com/cespare/xxhash/v2 v2.1.2 // indirect
6873
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
69-
github.com/containerd/containerd v1.5.7 // indirect
70-
github.com/containerd/continuity v0.1.0 // indirect
74+
github.com/containerd/containerd v1.5.9 // indirect
7175
github.com/davecgh/go-spew v1.1.1 // indirect
72-
github.com/docker/cli v20.10.7+incompatible // indirect
76+
github.com/docker/cli v20.10.11+incompatible // indirect
7377
github.com/docker/distribution v2.8.0+incompatible // indirect
74-
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
75-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
78+
github.com/docker/docker v20.10.12+incompatible // indirect
79+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
7680
github.com/docker/go-connections v0.4.0 // indirect
7781
github.com/docker/go-metrics v0.0.1 // indirect
7882
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
@@ -109,17 +113,17 @@ require (
109113
github.com/imdario/mergo v0.3.12 // indirect
110114
github.com/inconshreveable/mousetrap v1.0.0 // indirect
111115
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
112-
github.com/jmoiron/sqlx v1.3.1 // indirect
116+
github.com/jmoiron/sqlx v1.3.4 // indirect
113117
github.com/josharian/intern v1.0.0 // indirect
114118
github.com/json-iterator/go v1.1.12 // indirect
115119
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
116120
github.com/kevinburke/ssh_config v1.1.0 // indirect
117-
github.com/klauspost/compress v1.13.5 // indirect
121+
github.com/klauspost/compress v1.13.6 // indirect
118122
github.com/klauspost/cpuid v1.3.1 // indirect
119123
github.com/kylelemons/godebug v1.1.0 // indirect
120124
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
121125
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
122-
github.com/lib/pq v1.10.0 // indirect
126+
github.com/lib/pq v1.10.4 // indirect
123127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
124128
github.com/mailru/easyjson v0.7.6 // indirect
125129
github.com/mattn/go-colorable v0.1.12 // indirect
@@ -128,10 +132,10 @@ require (
128132
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
129133
github.com/minio/md5-simd v1.1.0 // indirect
130134
github.com/minio/sha256-simd v0.1.1 // indirect
131-
github.com/mitchellh/copystructure v1.1.1 // indirect
135+
github.com/mitchellh/copystructure v1.2.0 // indirect
132136
github.com/mitchellh/go-homedir v1.1.0 // indirect
133137
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
134-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
138+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
135139
github.com/moby/locker v1.0.1 // indirect
136140
github.com/moby/spdystream v0.2.0 // indirect
137141
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
@@ -141,7 +145,6 @@ require (
141145
github.com/morikuni/aec v1.0.0 // indirect
142146
github.com/opencontainers/go-digest v1.0.0 // indirect
143147
github.com/opencontainers/image-spec v1.0.2 // indirect
144-
github.com/opencontainers/runc v1.0.2 // indirect
145148
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
146149
github.com/pkg/errors v0.9.1 // indirect
147150
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -181,8 +184,8 @@ require (
181184
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
182185
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
183186
google.golang.org/appengine v1.6.7 // indirect
184-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
185-
google.golang.org/grpc v1.42.0 // indirect
187+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
188+
google.golang.org/grpc v1.43.0 // indirect
186189
google.golang.org/protobuf v1.27.1 // indirect
187190
gopkg.in/gorp.v1 v1.7.2 // indirect
188191
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -197,7 +200,7 @@ require (
197200
k8s.io/klog/v2 v2.40.1 // indirect
198201
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
199202
k8s.io/kubectl v0.23.2 // indirect
200-
oras.land/oras-go v0.4.0 // indirect
203+
oras.land/oras-go v1.1.0 // indirect
201204
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
202205
sigs.k8s.io/kustomize/api v0.10.1 // indirect
203206
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect

0 commit comments

Comments
 (0)