Skip to content

Commit d5f0f22

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#3781 from mboersma/cherry-pick-3757-to-release-1.9
[release-1.9] Use Helm binary in e2e tests to avoid import
2 parents a0df012 + 76b469f commit d5f0f22

File tree

8 files changed

+100
-358
lines changed

8 files changed

+100
-358
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ KUBECTL_VER := v1.25.6
113113
KUBECTL_BIN := kubectl
114114
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
115115

116-
HELM_VER := v3.11.3
116+
HELM_VER := v3.12.2
117117
HELM_BIN := helm
118118
HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
119119

‎go.mod‎

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ require (
3636
golang.org/x/crypto v0.8.0
3737
golang.org/x/mod v0.10.0
3838
golang.org/x/text v0.9.0
39-
helm.sh/helm/v3 v3.11.3
4039
k8s.io/api v0.26.2
4140
k8s.io/apimachinery v0.26.2
4241
k8s.io/client-go v0.26.2
@@ -52,7 +51,6 @@ require (
5251
)
5352

5453
require (
55-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
5654
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
5755
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5856
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -69,7 +67,6 @@ require (
6967
github.com/Masterminds/goutils v1.1.1 // indirect
7068
github.com/Masterminds/semver/v3 v3.2.0 // indirect
7169
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
72-
github.com/Masterminds/squirrel v1.5.3 // indirect
7370
github.com/Microsoft/go-winio v0.6.0 // indirect
7471
github.com/alessio/shellescape v1.4.1 // indirect
7572
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
@@ -78,37 +75,29 @@ require (
7875
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
7976
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8077
github.com/chai2010/gettext-go v1.0.2 // indirect
81-
github.com/containerd/containerd v1.7.0 // indirect
8278
github.com/coredns/caddy v1.1.0 // indirect
8379
github.com/coredns/corefile-migration v1.0.20 // indirect
84-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
8580
github.com/davecgh/go-spew v1.1.1 // indirect
8681
github.com/dimchansky/utfbom v1.1.1 // indirect
87-
github.com/docker/cli v20.10.21+incompatible // indirect
8882
github.com/docker/distribution v2.8.2+incompatible // indirect
8983
github.com/docker/docker v20.10.24+incompatible // indirect
90-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
9184
github.com/docker/go-connections v0.4.0 // indirect
92-
github.com/docker/go-metrics v0.0.1 // indirect
9385
github.com/docker/go-units v0.5.0 // indirect
9486
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
9587
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
9688
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
9789
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9890
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
9991
github.com/fatih/camelcase v1.0.0 // indirect
100-
github.com/fatih/color v1.15.0 // indirect
10192
github.com/felixge/httpsnoop v1.0.3 // indirect
10293
github.com/fsnotify/fsnotify v1.6.0 // indirect
10394
github.com/go-errors/errors v1.0.1 // indirect
104-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
10595
github.com/go-logr/stdr v1.2.2 // indirect
10696
github.com/go-openapi/jsonpointer v0.19.5 // indirect
10797
github.com/go-openapi/jsonreference v0.20.0 // indirect
10898
github.com/go-openapi/swag v0.22.3 // indirect
10999
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
110100
github.com/gobuffalo/flect v1.0.2 // indirect
111-
github.com/gobwas/glob v0.2.3 // indirect
112101
github.com/gofrs/uuid v4.2.0+incompatible // indirect
113102
github.com/gogo/protobuf v1.3.2 // indirect
114103
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
@@ -123,45 +112,32 @@ require (
123112
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
124113
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
125114
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
126-
github.com/gorilla/mux v1.8.0 // indirect
127-
github.com/gosuri/uitable v0.0.4 // indirect
128115
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
129116
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
130-
github.com/hashicorp/errwrap v1.1.0 // indirect
131117
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
132-
github.com/hashicorp/go-multierror v1.1.1 // indirect
133118
github.com/hashicorp/hcl v1.0.0 // indirect
134119
github.com/huandu/xstrings v1.4.0 // indirect
135120
github.com/imdario/mergo v0.3.13 // indirect
136121
github.com/inconshreveable/mousetrap v1.0.1 // indirect
137-
github.com/jmoiron/sqlx v1.3.5 // indirect
138122
github.com/josharian/intern v1.0.0 // indirect
139123
github.com/json-iterator/go v1.1.12 // indirect
140-
github.com/klauspost/compress v1.16.0 // indirect
141124
github.com/kr/fs v0.1.0 // indirect
142125
github.com/kylelemons/godebug v1.1.0 // indirect
143-
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
144-
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
145-
github.com/lib/pq v1.10.7 // indirect
146126
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
147127
github.com/magiconair/properties v1.8.7 // indirect
148128
github.com/mailru/easyjson v0.7.7 // indirect
149-
github.com/mattn/go-colorable v0.1.13 // indirect
150129
github.com/mattn/go-isatty v0.0.17 // indirect
151-
github.com/mattn/go-runewidth v0.0.14 // indirect
152130
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
153131
github.com/mitchellh/copystructure v1.2.0 // indirect
154132
github.com/mitchellh/go-homedir v1.1.0 // indirect
155133
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
156134
github.com/mitchellh/mapstructure v1.5.0 // indirect
157135
github.com/mitchellh/reflectwalk v1.0.2 // indirect
158-
github.com/moby/locker v1.0.1 // indirect
159136
github.com/moby/spdystream v0.2.0 // indirect
160137
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
161138
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
162139
github.com/modern-go/reflect2 v1.0.2 // indirect
163140
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
164-
github.com/morikuni/aec v1.0.0 // indirect
165141
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
166142
github.com/opencontainers/go-digest v1.0.0 // indirect
167143
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
@@ -171,9 +147,7 @@ require (
171147
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
172148
github.com/prometheus/client_model v0.3.0 // indirect
173149
github.com/prometheus/common v0.42.0 // indirect
174-
github.com/prometheus/procfs v0.9.0 // indirect
175-
github.com/rivo/uniseg v0.4.2 // indirect
176-
github.com/rubenv/sql-migrate v1.3.1 // indirect
150+
github.com/prometheus/procfs v0.10.1 // indirect
177151
github.com/russross/blackfriday/v2 v2.1.0 // indirect
178152
github.com/shopspring/decimal v1.3.1 // indirect
179153
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -185,19 +159,15 @@ require (
185159
github.com/stoewer/go-strcase v1.2.0 // indirect
186160
github.com/subosito/gotenv v1.4.2 // indirect
187161
github.com/valyala/fastjson v1.6.4 // indirect
188-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
189-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
190-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
191162
github.com/xlab/treeprint v1.1.0 // indirect
192163
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
193164
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
194165
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
195166
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
196-
golang.org/x/net v0.9.0 // indirect
167+
golang.org/x/net v0.10.0 // indirect
197168
golang.org/x/oauth2 v0.6.0 // indirect
198-
golang.org/x/sync v0.1.0 // indirect
199-
golang.org/x/sys v0.7.0 // indirect
200-
golang.org/x/term v0.7.0 // indirect
169+
golang.org/x/sys v0.10.0 // indirect
170+
golang.org/x/term v0.10.0 // indirect
201171
golang.org/x/time v0.3.0 // indirect
202172
golang.org/x/tools v0.7.0 // indirect
203173
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
@@ -216,7 +186,6 @@ require (
216186
k8s.io/cluster-bootstrap v0.25.0 // indirect
217187
k8s.io/component-helpers v0.26.2 // indirect
218188
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
219-
oras.land/oras-go v1.2.2 // indirect
220189
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
221190
sigs.k8s.io/kustomize/api v0.12.1 // indirect
222191
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

0 commit comments

Comments
 (0)