update controller gen and conversion gen (#633)

* update controller gen and conversion gen Signed-off-by: cpanato <[email protected]> * update generated files Signed-off-by: cpanato <[email protected]> --------- Signed-off-by: cpanato <[email protected]>
kubernetes-sigs · Sep 4, 2024 · 18c1328 · 18c1328
1 parent 92e34ce
commit 18c1328
Show file tree

Hide file tree

Showing 5 changed files with 328 additions and 271 deletions.
diff --git a/Makefile b/Makefile
@@ -121,11 +121,11 @@ help:  ## Display this help
 ## --------------------------------------
 
 # Binaries.
-CONTROLLER_GEN_VER := v0.13.0
+CONTROLLER_GEN_VER := v0.14.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-CONVERSION_GEN_VER := v0.28.6
+CONVERSION_GEN_VER := v0.29.3
 CONVERSION_GEN_BIN := conversion-gen
 CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
 
@@ -271,13 +271,8 @@ generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) $(MOCKGEN) ## Runs Go related g
 	$(CONTROLLER_GEN) \
 		paths=./ \
 		paths=./... \
+		paths=./$(EXP_DIR)/api/... \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
-	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha4 \
-		--build-tag=ignore_autogenerated_core_v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--output-file-base=zz_generated.conversion \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
 	go generate ./...
 
 .PHONY: generate-manifests