update controller-gen to v0.13.0

grafana · Oct 24, 2023 · 00ce5f3 · 00ce5f3
1 parent 0c3bf71
commit 00ce5f3
Show file tree

Hide file tree

Showing 5 changed files with 255 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -18,8 +18,7 @@ IMG_NAME ?= ghcr.io/grafana/k6-operator
 IMG_TAG ?= latest
 # Default dockerfile to build
 DOCKERFILE ?= "Dockerfile.controller"
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1,maxDescLen=0"
+CRD_OPTIONS ?= "crd:maxDescLen=0"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -119,7 +118,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen