Skip to content

Commit cfe6dc0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5167 from richardcase/e2e_kustomize_fix
🐛 fix: kustomize problem in e2e
2 parents 7e0812f + e09e669 commit cfe6dc0

File tree

10 files changed

+417
-91
lines changed

10 files changed

+417
-91
lines changed

‎hack/tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ $(KIND): $(BIN_DIR) go.mod go.sum
104104

105105
KUSTOMIZE := $(BIN_DIR)/kustomize
106106
$(KUSTOMIZE): $(BIN_DIR) go.mod go.sum # Build kustomize from tools folder.
107-
CGO_ENABLED=0 go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v4
107+
CGO_ENABLED=0 go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v5
108108

109109
MDBOOK_SHARE := $(SHARE_DIR)/mdbook$(MDBOOK_ARCHIVE_EXT)
110110
$(MDBOOK_SHARE): ../../versions.mk $(SHARE_DIR)

‎hack/tools/go.mod

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-aws/hack/tools
22

3-
go 1.22.0
4-
5-
toolchain go1.22.6
6-
7-
// kube-openapi should match the version imported by kustomize.
8-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
3+
go 1.22.7
94

105
require (
116
github.com/a8m/envsubst v1.4.2
@@ -24,7 +19,7 @@ require (
2419
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
2520
sigs.k8s.io/controller-tools v0.14.0
2621
sigs.k8s.io/kind v0.22.0
27-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
22+
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
2823
sigs.k8s.io/promo-tools/v4 v4.0.5
2924
sigs.k8s.io/testing_frameworks v0.1.2
3025
)
@@ -165,14 +160,13 @@ require (
165160
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
166161
github.com/emicklei/proto v1.12.1 // indirect
167162
github.com/emirpasic/gods v1.18.1 // indirect
168-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
169163
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
170164
github.com/fatih/color v1.16.0 // indirect
171165
github.com/felixge/httpsnoop v1.0.4 // indirect
172166
github.com/fsnotify/fsnotify v1.7.0 // indirect
173167
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
174168
github.com/go-chi/chi v4.1.2+incompatible // indirect
175-
github.com/go-errors/errors v1.0.1 // indirect
169+
github.com/go-errors/errors v1.4.2 // indirect
176170
github.com/go-fed/httpsig v1.1.0 // indirect
177171
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
178172
github.com/go-git/go-billy/v5 v5.5.0 // indirect
@@ -206,7 +200,6 @@ require (
206200
github.com/golang/protobuf v1.5.4 // indirect
207201
github.com/golang/snappy v0.0.4 // indirect
208202
github.com/google/certificate-transparency-go v1.1.8 // indirect
209-
github.com/google/gnostic v0.6.9 // indirect
210203
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
211204
github.com/google/go-cmp v0.6.0 // indirect
212205
github.com/google/go-containerregistry v0.19.1 // indirect
@@ -281,7 +274,6 @@ require (
281274
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
282275
github.com/oklog/ulid v1.3.1 // indirect
283276
github.com/oleiade/reflections v1.0.1 // indirect
284-
github.com/olekukonko/tablewriter v0.0.5 // indirect
285277
github.com/onsi/gomega v1.33.1 // indirect
286278
github.com/open-policy-agent/opa v0.63.0 // indirect
287279
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -344,7 +336,7 @@ require (
344336
github.com/xanzy/ssh-agent v0.3.3 // indirect
345337
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
346338
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
347-
github.com/xlab/treeprint v1.1.0 // indirect
339+
github.com/xlab/treeprint v1.2.0 // indirect
348340
github.com/yashtewari/glob-intersection v0.2.0 // indirect
349341
github.com/yuin/gopher-lua v1.1.1 // indirect
350342
github.com/zeebo/errs v1.3.0 // indirect
@@ -357,7 +349,6 @@ require (
357349
go.opentelemetry.io/otel/metric v1.24.0 // indirect
358350
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
359351
go.opentelemetry.io/otel/trace v1.24.0 // indirect
360-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
361352
go.step.sm/crypto v0.44.2 // indirect
362353
go.uber.org/automaxprocs v1.5.3 // indirect
363354
go.uber.org/multierr v1.11.0 // indirect
@@ -383,6 +374,7 @@ require (
383374
google.golang.org/grpc v1.62.1 // indirect
384375
google.golang.org/protobuf v1.34.2 // indirect
385376
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
377+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
386378
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
387379
gopkg.in/inf.v0 v0.9.1 // indirect
388380
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -402,9 +394,9 @@ require (
402394
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
403395
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
404396
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
405-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
406-
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
407-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
397+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
398+
sigs.k8s.io/kustomize/cmd/config v0.15.0 // indirect
399+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
408400
sigs.k8s.io/release-sdk v0.11.0 // indirect
409401
sigs.k8s.io/release-utils v0.7.7 // indirect
410402
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)