Skip to content

Commit c489dbb

Browse files
authored
Bump k8s.io/* deps to v1.33 (#1310)
* Bump `k8s.io/*` deps to v1.33 Bump the `k8s.io/*` and controller-runtime dependencies to support Kubernetes v1.33. * Fix build * Bump `k8s.io/*` deps to v0.33.3
1 parent 72224a9 commit c489dbb

43 files changed

Lines changed: 633 additions & 334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ dev/
2929
charts/
3030
apiserver.local.config/
3131
default.etcd/
32+
.DS_Store
3233

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BUCKETBROKER_IMG ?= bucketbroker:latest
1212
IRICTL_BUCKET_IMG ?= irictl-bucket:latest
1313

1414
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
15-
ENVTEST_K8S_VERSION = 1.32.0
15+
ENVTEST_K8S_VERSION = 1.33.0
1616

1717
# Docker image name for the mkdocs based local development setup
1818
IMAGE=ironcore/documentation
@@ -360,15 +360,15 @@ PROTOC_GEN_GO_GRPC ?= $(LOCALBIN)/protoc-gen-go-grpc
360360
## Tool Versions
361361
KUSTOMIZE_VERSION ?= v5.1.1
362362
VGOPATH_VERSION ?= v0.1.3
363-
CONTROLLER_TOOLS_VERSION ?= v0.17.2
363+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
364364
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
365365
ADDLICENSE_VERSION ?= v1.1.1
366366
PROTOC_GEN_GO_VERSION ?= v1.36.6
367367
PROTOC_GEN_GO_GRPC_VERSION ?= v1.5.1
368368
GOIMPORTS_VERSION ?= v0.31.0
369369
GOLANGCI_LINT_VERSION ?= v2.1
370370
OPENAPI_EXTRACTOR_VERSION ?= v0.1.9
371-
SETUP_ENVTEST_VERSION ?= release-0.20
371+
SETUP_ENVTEST_VERSION ?= release-0.21
372372
BUF_VERSION ?= v1.51.0
373373

374374
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -387,13 +387,11 @@ $(CONTROLLER_GEN): $(LOCALBIN)
387387
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
388388
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
389389

390-
391390
.PHONY: openapi-gen
392391
openapi-gen: $(OPENAPI_GEN) ## Download openapi-gen locally if necessary.
393392
$(OPENAPI_GEN): $(LOCALBIN)
394393
test -s $(LOCALBIN)/openapi-gen || GOBIN=$(LOCALBIN) go install k8s.io/kube-openapi/cmd/openapi-gen
395394

396-
397395
.PHONY: vgopath
398396
vgopath: $(VGOPATH) ## Download vgopath locally if necessary.
399397
.PHONY: $(VGOPATH)

broker/bucketbroker/server/server_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var _ = BeforeSuite(func() {
6969
// Note that you must have the required binaries setup under the bin directory to perform
7070
// the tests directly. When we run make test it will be setup and used automatically.
7171
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
72-
fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
72+
fmt.Sprintf("1.33.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
7373
}
7474
testEnvExt = &utilsenvtest.EnvironmentExtensions{
7575
APIServiceDirectoryPaths: []string{

broker/machinebroker/server/server_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var _ = BeforeSuite(func() {
7676
// Note that you must have the required binaries setup under the bin directory to perform
7777
// the tests directly. When we run make test it will be setup and used automatically.
7878
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
79-
fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
79+
fmt.Sprintf("1.33.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
8080
}
8181
testEnvExt = &utilsenvtest.EnvironmentExtensions{
8282
APIServiceDirectoryPaths: []string{

broker/volumebroker/server/server_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var _ = BeforeSuite(func() {
7070
// Note that you must have the required binaries setup under the bin directory to perform
7171
// the tests directly. When we run make test it will be setup and used automatically.
7272
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
73-
fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
73+
fmt.Sprintf("1.33.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
7474
}
7575
testEnvExt = &utilsenvtest.EnvironmentExtensions{
7676
APIServiceDirectoryPaths: []string{

client-go/informers/externalversions/compute/v1alpha1/machine.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/informers/externalversions/compute/v1alpha1/machineclass.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/informers/externalversions/compute/v1alpha1/machinepool.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/informers/externalversions/core/v1alpha1/resourcequota.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/informers/externalversions/ipam/v1alpha1/prefix.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)