chore: move to crd v1

rudoi · Aug 22, 2020 · 062c878 · 062c878
1 parent 0a60fb9
commit 062c878
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 505 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,6 @@
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -36,11 +34,11 @@ deploy: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) \
+	$(CONTROLLER_GEN) \
 		crd:crdVersions=v1 \
 		rbac:roleName=manager-role \
 		webhook paths="./..." \
-		output:crd:artifacts:config=config/crd/bases
+		output:crd:dir=./config/crd/bases
 
 # Run go fmt against code
 fmt: