Skip to content

Commit 53e9ab0

Browse files
committed
chore: bump tooling
Our tooling is outdated and should be bumped to latest stable versions.
1 parent 59e1588 commit 53e9ab0

File tree

3 files changed

+46
-104
lines changed

3 files changed

+46
-104
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,43 +78,43 @@ KUSTOMIZE_VER := v5.0.1
7878
KUSTOMIZE_BIN := kustomize
7979
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
8080

81-
SETUP_ENVTEST_VER := v0.0.0-20211110210527-619e6b92dab9
81+
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
8282
SETUP_ENVTEST_BIN := setup-envtest
8383
SETUP_ENVTEST := $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER)
8484

85-
GOTESTSUM_VER := v1.6.4
85+
GOTESTSUM_VER := v1.11.0
8686
GOTESTSUM_BIN := gotestsum
8787
GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)
8888

89-
GINKGO_VER := v2.13.1
89+
GINKGO_VER := v2.17.1
9090
GINKGO_BIN := ginkgo
9191
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9292

9393
ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
9494
ENVSUBST_BIN := envsubst
9595
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-$(ENVSUBST_VER)
9696

97-
GO_APIDIFF_VER := v0.5.0
97+
GO_APIDIFF_VER := v0.8.2
9898
GO_APIDIFF_BIN := go-apidiff
9999
GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER)
100100

101-
HELM_VER := v3.8.1
101+
HELM_VER := v3.14.4
102102
HELM_BIN := helm
103103
HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
104104

105-
YQ_VER := v4.25.2
105+
YQ_VER := v4.35.2
106106
YQ_BIN := yq
107107
YQ := $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER)
108108

109109
KPROMO_VER := v4.0.5
110110
KPROMO_BIN := kpromo
111111
KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
112112

113-
CONVERSION_GEN_VER := v0.27.3
113+
CONVERSION_GEN_VER := v0.29.2
114114
CONVERSION_GEN_BIN := conversion-gen
115115
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
116116

117-
CONVERSION_VERIFIER_VER := v1.5.0
117+
CONVERSION_VERIFIER_VER := v1.7.0
118118
CONVERSION_VERIFIER_BIN := conversion-verifier
119119
CONVERSION_VERIFIER := $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN)-$(CONVERSION_VERIFIER_VER)
120120

@@ -554,4 +554,4 @@ test-e2e-run: $(GINKGO) $(ENVSUBST) $(HELM) ## Run e2e tests
554554
-e2e.helm-binary-path=$(HELM) -e2e.chart-path=$(CHART_PACKAGE_DIR)/cluster-api-operator-$(HELM_CHART_TAG).tgz $(E2E_ARGS)
555555

556556
go-version: ## Print the go version we use to compile our binaries and images
557-
@echo $(GO_VERSION)
557+
@echo $(GO_VERSION)

hack/tools/go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1
88

99
require (
1010
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
11-
github.com/joelanford/go-apidiff v0.7.0
12-
github.com/onsi/ginkgo/v2 v2.13.2
11+
github.com/joelanford/go-apidiff v0.8.2
12+
github.com/onsi/ginkgo/v2 v2.17.1
1313
gotest.tools/gotestsum v1.11.0
1414
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116064735-bfe8d0d16ff3
15-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
16-
sigs.k8s.io/controller-tools v0.13.0
15+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240215143116-d0396a3d6f9f
16+
sigs.k8s.io/controller-tools v0.14.0
1717
)
1818

1919
require (
@@ -57,28 +57,28 @@ require (
5757
github.com/spf13/pflag v1.0.5 // indirect
5858
github.com/xanzy/ssh-agent v0.3.3 // indirect
5959
go.uber.org/multierr v1.11.0 // indirect
60-
go.uber.org/zap v1.25.0 // indirect
60+
go.uber.org/zap v1.26.0 // indirect
6161
golang.org/x/crypto v0.18.0 // indirect
6262
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
6363
golang.org/x/mod v0.14.0 // indirect
6464
golang.org/x/net v0.20.0 // indirect
65-
golang.org/x/sync v0.5.0 // indirect
65+
golang.org/x/sync v0.6.0 // indirect
6666
golang.org/x/sys v0.16.0 // indirect
6767
golang.org/x/term v0.16.0 // indirect
6868
golang.org/x/text v0.14.0 // indirect
69-
golang.org/x/tools v0.16.1 // indirect
69+
golang.org/x/tools v0.17.0 // indirect
7070
gopkg.in/inf.v0 v0.9.1 // indirect
7171
gopkg.in/warnings.v0 v0.1.2 // indirect
7272
gopkg.in/yaml.v2 v2.4.0 // indirect
7373
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/api v0.28.5 // indirect
75-
k8s.io/apiextensions-apiserver v0.28.5 // indirect
76-
k8s.io/apimachinery v0.28.5 // indirect
77-
k8s.io/klog/v2 v2.100.1 // indirect
74+
k8s.io/api v0.29.0 // indirect
75+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
76+
k8s.io/apimachinery v0.29.0 // indirect
77+
k8s.io/klog/v2 v2.110.1 // indirect
7878
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
7979
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 // indirect
8080
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8181
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
82-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
82+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8383
sigs.k8s.io/yaml v1.4.0 // indirect
8484
)

0 commit comments

Comments
 (0)