Skip to content

Commit 3f25319

Browse files
damdodamdo
committed
capi v1.9.0-beta.0
1 parent e1eea20 commit 3f25319

File tree

8 files changed

+188
-185
lines changed

8 files changed

+188
-185
lines changed

‎Makefile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ export GOPROXY
3232
# Active module mode, as we use go modules to manage dependencies
3333
export GO111MODULE=on
3434

35+
# Go version
36+
GOLANG_VERSION := 1.22.8
37+
3538
# Kubebuilder
36-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
39+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
3740
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
3841
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
3942

@@ -59,11 +62,11 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
5962
# Binaries.
6063
CLUSTERCTL := $(BIN_DIR)/clusterctl
6164

62-
CONTROLLER_GEN_VER := v0.16.3
65+
CONTROLLER_GEN_VER := v0.16.5
6366
CONTROLLER_GEN_BIN := controller-gen
6467
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6568

66-
CONVERSION_GEN_VER := v0.30.5
69+
CONVERSION_GEN_VER := v0.31.2
6770
CONVERSION_GEN_BIN := conversion-gen
6871
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6972

@@ -87,12 +90,12 @@ RELEASE_NOTES_VER := v0.11.0
8790
RELEASE_NOTES_BIN := release-notes
8891
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
8992

90-
GINKGO_VER := v2.20.2
93+
GINKGO_VER := v2.21.0
9194
GINKGO_BIN := ginkgo
9295
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9396
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
9497

95-
KUBECTL_VER := v1.30.5
98+
KUBECTL_VER := v1.31.2
9699
KUBECTL_BIN := kubectl
97100
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
98101

@@ -111,7 +114,7 @@ GOTESTSUM_BIN := gotestsum
111114
GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)
112115

113116
# Other tools versions
114-
CERT_MANAGER_VER := v1.14.4
117+
CERT_MANAGER_VER := v1.16.1
115118

116119
# Define Docker related variables. Releases should modify and double check these vars.
117120
export GCP_PROJECT ?= $(shell gcloud config get-value project)
@@ -145,8 +148,6 @@ endif
145148
# Build time versioning details.
146149
LDFLAGS := $(shell hack/version.sh)
147150

148-
GOLANG_VERSION := 1.21.10
149-
150151
# CI
151152
CAPG_WORKER_CLUSTER_KUBECONFIG ?= "/tmp/kubeconfig"
152153

‎go.mod‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ toolchain go1.22.8
66

77
replace (
88
// cel-go should match the version imported by CAPI.
9-
github.com/google/cel-go => github.com/google/cel-go v0.17.8
9+
github.com/google/cel-go => github.com/google/cel-go v0.20.1
1010
// kube-openapi should match the version imported by CAPI.
1111
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
12-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.4
12+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.0-beta.0
1313
)
1414

1515
require (
@@ -21,8 +21,8 @@ require (
2121
github.com/go-logr/logr v1.4.2
2222
github.com/google/go-cmp v0.6.0
2323
github.com/googleapis/gax-go/v2 v2.13.0
24-
github.com/onsi/ginkgo/v2 v2.20.2
25-
github.com/onsi/gomega v1.34.2
24+
github.com/onsi/ginkgo/v2 v2.21.0
25+
github.com/onsi/gomega v1.35.1
2626
github.com/pkg/errors v0.9.1
2727
github.com/spf13/pflag v1.0.5
2828
github.com/stretchr/testify v1.9.0
@@ -31,30 +31,31 @@ require (
3131
golang.org/x/net v0.30.0
3232
google.golang.org/api v0.201.0
3333
google.golang.org/grpc v1.67.1
34-
k8s.io/api v0.30.5
35-
k8s.io/apimachinery v0.30.5
36-
k8s.io/client-go v0.30.5
37-
k8s.io/component-base v0.30.5
34+
k8s.io/api v0.31.2
35+
k8s.io/apimachinery v0.31.2
36+
k8s.io/client-go v0.31.2
37+
k8s.io/component-base v0.31.2
3838
k8s.io/klog/v2 v2.130.1
3939
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
40-
sigs.k8s.io/cluster-api v1.8.4
41-
sigs.k8s.io/cluster-api/test v1.8.4
42-
sigs.k8s.io/controller-runtime v0.18.5
40+
sigs.k8s.io/cluster-api v1.9.0-beta.0
41+
sigs.k8s.io/cluster-api/test v1.9.0-beta.0
42+
sigs.k8s.io/controller-runtime v0.19.1
4343
)
4444

4545
require (
4646
cloud.google.com/go v0.116.0 // indirect
4747
cloud.google.com/go/auth v0.9.8 // indirect
4848
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
4949
cloud.google.com/go/longrunning v0.6.1 // indirect
50+
dario.cat/mergo v1.0.1 // indirect
5051
github.com/NYTimes/gziphandler v1.1.1 // indirect
5152
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
52-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
53+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5354
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5455
github.com/cloudflare/circl v1.3.7 // indirect
5556
github.com/distribution/reference v0.6.0 // indirect
56-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
5757
github.com/felixge/httpsnoop v1.0.4 // indirect
58+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5859
github.com/go-logr/stdr v1.2.2 // indirect
5960
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6061
github.com/google/gnostic-models v0.6.8 // indirect
@@ -66,6 +67,7 @@ require (
6667
github.com/sagikazarmark/locafero v0.4.0 // indirect
6768
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
6869
github.com/sourcegraph/conc v0.3.0 // indirect
70+
github.com/x448/float16 v0.8.4 // indirect
6971
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
7072
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
7173
go.opentelemetry.io/otel v1.29.0 // indirect
@@ -77,6 +79,7 @@ require (
7779
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7880
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
7981
golang.org/x/sync v0.8.0 // indirect
82+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8083
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
8184
)
8285

@@ -85,17 +88,17 @@ require (
8588
github.com/BurntSushi/toml v1.4.0 // indirect
8689
github.com/MakeNowJust/heredoc v1.0.0 // indirect
8790
github.com/Masterminds/goutils v1.1.1 // indirect
88-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
89-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
91+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
92+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
9093
github.com/Microsoft/go-winio v0.5.0 // indirect
91-
github.com/adrg/xdg v0.5.0 // indirect
94+
github.com/adrg/xdg v0.5.3 // indirect
9295
github.com/alessio/shellescape v1.4.2 // indirect
9396
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
9497
github.com/beorn7/perks v1.0.1 // indirect
9598
github.com/blang/semver/v4 v4.0.0 // indirect
9699
github.com/cespare/xxhash/v2 v2.3.0 // indirect
97100
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
98-
github.com/docker/docker v27.1.1+incompatible // indirect
101+
github.com/docker/docker v27.3.1+incompatible // indirect
99102
github.com/docker/go-connections v0.5.0 // indirect
100103
github.com/docker/go-units v0.4.0 // indirect
101104
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -106,20 +109,20 @@ require (
106109
github.com/go-openapi/jsonpointer v0.19.6 // indirect
107110
github.com/go-openapi/jsonreference v0.20.2 // indirect
108111
github.com/go-openapi/swag v0.22.4 // indirect
109-
github.com/gobuffalo/flect v1.0.2 // indirect
112+
github.com/gobuffalo/flect v1.0.3 // indirect
110113
github.com/gogo/protobuf v1.3.2 // indirect
111114
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
112115
github.com/golang/protobuf v1.5.4 // indirect
113116
github.com/google/cel-go v0.20.1 // indirect
114117
github.com/google/go-querystring v1.1.0 // indirect
115118
github.com/google/gofuzz v1.2.0 // indirect
116-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
119+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
117120
github.com/google/s2a-go v0.1.8 // indirect
118121
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
119122
github.com/google/uuid v1.6.0 // indirect
120123
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
121124
github.com/hashicorp/hcl v1.0.0 // indirect
122-
github.com/huandu/xstrings v1.3.3 // indirect
125+
github.com/huandu/xstrings v1.5.0 // indirect
123126
github.com/imdario/mergo v0.3.13 // indirect
124127
github.com/inconshreveable/mousetrap v1.1.0 // indirect
125128
github.com/josharian/intern v1.0.0 // indirect
@@ -142,9 +145,9 @@ require (
142145
github.com/prometheus/client_model v0.6.1 // indirect
143146
github.com/prometheus/common v0.59.1 // indirect
144147
github.com/prometheus/procfs v0.15.1 // indirect
145-
github.com/shopspring/decimal v1.3.1 // indirect
148+
github.com/shopspring/decimal v1.4.0 // indirect
146149
github.com/spf13/afero v1.11.0 // indirect
147-
github.com/spf13/cast v1.6.0 // indirect
150+
github.com/spf13/cast v1.7.0 // indirect
148151
github.com/spf13/cobra v1.8.1 // indirect
149152
github.com/spf13/viper v1.19.0 // indirect
150153
github.com/stoewer/go-strcase v1.2.0 // indirect
@@ -158,7 +161,7 @@ require (
158161
golang.org/x/term v0.25.0 // indirect
159162
golang.org/x/text v0.19.0 // indirect
160163
golang.org/x/time v0.7.0 // indirect
161-
golang.org/x/tools v0.24.0 // indirect
164+
golang.org/x/tools v0.26.0 // indirect
162165
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
163166
google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect
164167
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
@@ -168,9 +171,9 @@ require (
168171
gopkg.in/ini.v1 v1.67.0 // indirect
169172
gopkg.in/yaml.v2 v2.4.0 // indirect
170173
gopkg.in/yaml.v3 v3.0.1 // indirect
171-
k8s.io/apiextensions-apiserver v0.30.5 // indirect
172-
k8s.io/apiserver v0.30.5 // indirect
173-
k8s.io/cluster-bootstrap v0.30.5 // indirect
174+
k8s.io/apiextensions-apiserver v0.31.2 // indirect
175+
k8s.io/apiserver v0.31.2 // indirect
176+
k8s.io/cluster-bootstrap v0.31.2 // indirect
174177
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
175178
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
176179
sigs.k8s.io/kind v0.24.0 // indirect

0 commit comments

Comments
 (0)