Merge pull request #3749 from srm09/v1alpha4-types

⚠️ Generate v1alpha4 types

Makefile

@@ -231,8 +231,12 @@ generate-go-core: $(CONTROLLER_GEN) $(CONVERSION_GEN)
 		paths=./$(EXP_DIR)/api/... \
 		paths=./$(EXP_DIR)/addons/api/... \
 		paths=./cmd/clusterctl/...
+	$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha3,./$(EXP_DIR)/api/v1alpha3,./$(EXP_DIR)/addons/api/v1alpha3"
 	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha2 \
+		--input-dirs=./api/v1alpha3 \
+		--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
+		--input-dirs=./$(EXP_DIR)/addons/api/v1alpha3 \
+		--build-tag=ignore_autogenerated_core_v1alpha3 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 
@@ -242,8 +246,11 @@ generate-go-kubeadm-bootstrap: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go re
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		paths=./bootstrap/kubeadm/api/... \
 		paths=./bootstrap/kubeadm/types/...
+	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api"
 	$(CONVERSION_GEN) \
-		--input-dirs=./bootstrap/kubeadm/api/v1alpha2 \
+		--input-dirs=./bootstrap/kubeadm/api/v1alpha3 \
+		--build-tag=ignore_autogenerated_kubeadm_bootstrap_v1alpha3 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 
@@ -252,6 +259,13 @@ generate-go-kubeadm-control-plane: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs G
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		paths=./controlplane/kubeadm/api/...
+	$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api"
+	$(CONVERSION_GEN) \
+		--input-dirs=./controlplane/kubeadm/api/v1alpha3 \
+		--build-tag=ignore_autogenerated_kubeadm_controlplane_v1alpha3 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3,sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3 \
+		--output-file-base=zz_generated.conversion \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 
 .PHONY: generate-bindata
 generate-bindata: $(KUSTOMIZE) $(GOBINDATA) clean-bindata $(CLOUDINIT_GENERATED) ## Generate code for embedding the clusterctl api manifest
@@ -613,3 +627,6 @@ diagrams: ## Build proposal diagrams
 serve-book: ## Build and serve the book with live-reloading enabled
 	$(MAKE) -C docs/book serve
 
+.PHONY: clean-generated-conversions
+clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs
+	(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)

PROJECT

@@ -3,29 +3,32 @@ domain: x-k8s.io
 repo: sigs.k8s.io/cluster-api
 resources:
 - group: cluster
-  version: v1alpha2
+  version: v1alpha3
   kind: Cluster
 - group: cluster
-  version: v1alpha2
+  version: v1alpha3
   kind: Machine
 - group: cluster
-  version: v1alpha2
+  version: v1alpha3
   kind: MachineSet
 - group: cluster
-  version: v1alpha2
+  version: v1alpha3
   kind: MachineDeployment
 - group: cluster
   version: v1alpha3
+  kind: MachinePool
+- group: cluster
+  version: v1alpha4
   kind: Cluster
 - group: cluster
-  version: v1alpha3
+  version: v1alpha4
   kind: Machine
 - group: cluster
-  version: v1alpha3
+  version: v1alpha4
   kind: MachineSet
 - group: cluster
-  version: v1alpha3
+  version: v1alpha4
   kind: MachineDeployment
 - group: cluster
-  version: v1alpha3
+  version: v1alpha4
   kind: MachinePool