From ff5ba602e72db9d8b88de6119e8ddb8b56f64546 Mon Sep 17 00:00:00 2001
From: Anish Ramasekar <anish.ramasekar@gmail.com>
Date: Wed, 15 Mar 2023 13:10:28 -0700
Subject: [PATCH] chore: bump controller-gen to v0.10.0 (#793)

Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
---
 Makefile                      | 7 ++-----
 config/rbac/role.yaml         | 2 --
 config/webhook/manifests.yaml | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a970b7653..52f2cab93 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
 
 # Binaries
-CONTROLLER_GEN_VER := v0.5.0
+CONTROLLER_GEN_VER := v0.10.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
@@ -151,9 +151,6 @@ docker-push-manifest:
 		docker manifest push --purge $(REGISTRY)/$${img}:$(IMAGE_VERSION); \
 	done
 
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
-
 .PHONY: all
 all: manager
 
@@ -201,7 +198,7 @@ uninstall-deploy: $(KUBECTL) $(KUSTOMIZE) $(ENVSUBST)
 # Generate manifests e.g. CRD, RBAC etc.
 .PHONY: manifests
 manifests: $(CONTROLLER_GEN) $(KUSTOMIZE)
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..."
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..."
 
 	rm -rf manifest_staging
 	mkdir -p manifest_staging/deploy
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 33aac3f51..d0030a504 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -23,7 +22,6 @@ rules:
   - list
   - update
   - watch
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
index 5eaef5e0a..9d780c0bf 100644
--- a/config/webhook/manifests.yaml
+++ b/config/webhook/manifests.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration