From 16d9c54a1939e3fa9a2a120768839182ca084e77 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Mon, 22 Apr 2024 11:48:43 +0530 Subject: [PATCH] hack: Update controller-gen to v0.14.0 Golang v1.22 doesn't work well[1] with any controller-gen < v0.14.0. Updating controller-gen mandates removal of trivialVersions boolean marker previously used for legacy v1beta1 CRDs[2]. [1] https://github.com/kubernetes-sigs/controller-tools/issues/888#issuecomment-2046073715 [2] https://github.com/kubernetes-sigs/controller-tools/releases/tag/v0.7.0 Signed-off-by: Anoop C S --- Makefile | 2 +- hack/install-tools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5141ec99..37951bf4 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ TAG?=latest IMG?=quay.io/samba.org/samba-operator:$(TAG) # Produce CRDs that work on Kubernetes 1.16 or later -CRD_OPTIONS?="crd:trivialVersions=true,crdVersions=v1" +CRD_OPTIONS?="crd:crdVersions=v1" CHECK_GOFMT_FLAGS?=-e -s -l diff --git a/hack/install-tools.sh b/hack/install-tools.sh index 8db332b7..a720f490 100755 --- a/hack/install-tools.sh +++ b/hack/install-tools.sh @@ -36,7 +36,7 @@ _install_kustomize() { } _install_controller_gen() { - _install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 + _install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 } _install_revive() {