update controller-gen to 0.14.0 and conversion-gen to 0.30.0, regenerate CRDs

Signed-off-by: Ashley Dumaine <[email protected]>

Author: AshleyDumaine

Makefile

@@ -53,8 +53,8 @@ export PATH := $(KREW_ROOT)/bin:$(PATH)
 
 # Set --output-base for conversion-gen if we are not within GOPATH
 ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher/cluster-api-provider-rke2)
-	CONVERSION_GEN_OUTPUT_BASE_CAPRKE2 := --output-base=$(ROOT_DIR)/$(CAPRKE2_DIR)
-	CONVERSION_GEN_OUTPUT_BASE_CAPBPR := --output-base=$(ROOT_DIR)/$(CAPBPR_DIR)
+	CONVERSION_GEN_OUTPUT_BASE_CAPRKE2 := --output-dir=$(ROOT_DIR)/$(CAPRKE2_DIR)
+	CONVERSION_GEN_OUTPUT_BASE_CAPBPR := --output-dir=$(ROOT_DIR)/$(CAPBPR_DIR)
 else
 	export GOPATH := $(shell go env GOPATH)
 endif
@@ -77,7 +77,7 @@ CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
 CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
 
-CONVERSION_GEN_VER := v0.28.0
+CONVERSION_GEN_VER := v0.30.0
 CONVERSION_GEN_BIN := conversion-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
@@ -210,20 +210,19 @@ generate-go-conversions: ## Run all generate-go-conversions-* targets
 generate-go-conversions-rke2-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for the rke2 bootstrap
 	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/api/v1alpha1"
 	$(CONVERSION_GEN) \
-		--input-dirs=./bootstrap/api/v1alpha1 \
-		--build-tag=ignore_autogenerated_rke2_bootstrap \
-		--output-file-base=zz_generated.conversion $(ROOT_DIR) \
-		--go-header-file=./hack/boilerplate.go.txt
+		--output-file=zz_generated.conversion.go $(ROOT_DIR)/$(CAPBPR_DIR) \
+		--go-header-file=./hack/boilerplate.go.txt \
+		./bootstrap/api/v1alpha1
 
 .PHONY: generate-go-conversions-rke2-control-plane
 generate-go-conversions-rke2-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for the rke2 control plane
 	$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/api/v1alpha1"
 	$(CONVERSION_GEN) \
-		--input-dirs=./controlplane/api/v1alpha1 \
-		--extra-peer-dirs=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
+		--extra-dirs=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
 		--build-tag=ignore_autogenerated_rk2_control_plane \
-		--output-file-base=zz_generated.conversion $(ROOT_DIR) \
-		--go-header-file=./hack/boilerplate.go.txt
+		--output-file=zz_generated.conversion.go $(ROOT_DIR)/$(CAPRKE2_DIR) \
+		--go-header-file=./hack/boilerplate.go.txt \
+		./controlplane/api/v1alpha1
 
 .PHONY: generate-modules
 generate-modules: ## Run go mod tidy to ensure modules are up to date