Add v1beta2 APIs

Author: sedefsavas

Makefile

@@ -177,10 +177,8 @@ endif
 .PHONY: defaulters
 defaulters: $(DEFAULTER_GEN) ## Generate all Go types
 	$(DEFAULTER_GEN) \
-		--input-dirs=./api/v1alpha3 \
-		--input-dirs=./api/v1alpha4 \
-		--input-dirs=./api/v1beta1 \
-		--input-dirs=./$(EXP_DIR)/api/v1beta1 \
+		--input-dirs=./api/v1beta2 \
+		--input-dirs=./$(EXP_DIR)/api/v1beta2 \
 		--input-dirs=./cmd/clusterawsadm/api/bootstrap/v1beta1 \
 		--input-dirs=./cmd/clusterawsadm/api/bootstrap/v1alpha1 \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
@@ -197,86 +195,67 @@ $(CRD_DOCS_DIR)/%: $(API_FILES)
 
 .PHONY: generate-go ## Generate all Go api files
 generate-go: $(MOCKGEN)
-	$(MAKE) generate-go-apis
+#	$(MAKE) generate-go-apis
 	go generate ./...
 
 .PHONY: generate-go-apis
 generate-go-apis: ## Alias for .build/generate-go-apis
+	rm -rf .build/generate-go-apis
 	$(MAKE) .build/generate-go-apis
 
 .build: ## Create the .build folder
 	mkdir -p .build
 
 .build/generate-go-apis: .build $(API_FILES) $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(CONVERSION_GEN) ## Generate all Go api files
-	$(CONTROLLER_GEN) \
-		paths=./api/... \
-		paths=./$(EXP_DIR)/api/... \
-		paths=./bootstrap/eks/api/... \
-		paths=./controlplane/eks/api/... \
-		paths=./iam/api/... \
-		crd:crdVersions=v1 \
-		output:crd:dir=config/crd/bases \
-		output:webhook:dir=$(WEBHOOK_ROOT) \
-		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-		webhook
-
-	$(CONTROLLER_GEN) \
-		paths=./controllers/... \
-		paths=./$(EXP_DIR)/controllers/... \
-		paths=./bootstrap/eks/controllers/... \
-		paths=./controlplane/eks/controllers/... \
-		output:rbac:dir=$(RBAC_ROOT) \
-		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-		rbac:roleName=manager-role
-
-	$(CONTROLLER_GEN) \
-		paths=./cmd/... \
-		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
-
-	$(MAKE) defaulters
-
-	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha3 \
-		--input-dirs=./api/v1alpha4 \
-		--input-dirs=./cmd/clusterawsadm/api/bootstrap/v1alpha1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-
-	$(CONVERSION_GEN) \
-		--input-dirs=./bootstrap/eks/api/v1alpha3 \
-		--input-dirs=./bootstrap/eks/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-
-	$(CONVERSION_GEN) \
-		--input-dirs=./controlplane/eks/api/v1alpha3 \
-		--input-dirs=./controlplane/eks/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-
-	$(CONVERSION_GEN) \
-		--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
-		--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
-		--build-tag=ignore_autogenerated_conversions \
-		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+#	$(CONTROLLER_GEN) \
+#		paths=./api/... \
+#		paths=./$(EXP_DIR)/api/... \
+#		paths=./bootstrap/eks/api/... \
+#		paths=./controlplane/eks/api/... \
+#		paths=./iam/api/... \
+#		output:crd:dir=config/crd/bases \
+#		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
+#		crd:crdVersions=v1 \
+#		rbac:roleName=manager-role \
+#		webhook
+#
+#	$(CONTROLLER_GEN) \
+#		paths=./cmd/... \
+#		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
+#
+#	$(MAKE) defaulters
+#
+#	$(CONVERSION_GEN) \
+#		--input-dirs=./api/v1beta1 \
+#		--input-dirs=./cmd/clusterawsadm/api/bootstrap/v1alpha1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+#		--build-tag=ignore_autogenerated_conversions \
+#		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
+#		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+
+#	$(CONVERSION_GEN) \
+#		--input-dirs=./$(EXP_DIR)/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+#		--build-tag=ignore_autogenerated_conversions \
+#		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
+#		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+#
+#	$(CONVERSION_GEN) \
+#		--input-dirs=./bootstrap/eks/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+#		--build-tag=ignore_autogenerated_conversions \
+#		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
+#		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+#
+#	$(CONVERSION_GEN) \
+#		--input-dirs=./controlplane/eks/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
+#		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+#		--build-tag=ignore_autogenerated_conversions \
+#		--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
+#		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 
 		touch $@
 
@@ -407,7 +386,7 @@ setup-envtest: install-setup-envtest # Build setup-envtest from tools folder.
 
 .PHONY: test
 test: setup-envtest ## Run tests
-	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test ./...
+	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test ./api/...
 
 .PHONY: test-verbose
 test-verbose: setup-envtest ## Run tests with verbose settings.
@@ -694,4 +673,3 @@ clean-temporary: ## Remove all temporary files and folders
 	rm -rf test/e2e/capi-kubeadm-control-plane-controller-manager
 	rm -rf test/e2e/logs
 	rm -rf test/e2e/resources
-

PROJECT

@@ -2,84 +2,59 @@ version: "2"
 domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-aws
 resources:
-# v1alpha3 types
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSMachine
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSCluster
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSMachineTemplate
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSClusterStaticIdentity
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSClusterRoleIdentity
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSClusterControllerIdentity
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSManagedControlPlanes
-- group: infrastructure
-  version: v1alpha3
-  kind: AWSManagedCluster
-# v1alpha4 types
+# v1beta1 types
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSMachine
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSCluster
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSMachineTemplate
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSClusterStaticIdentity
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSClusterRoleIdentity
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSClusterControllerIdentity
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSClusterTemplate
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSManagedControlPlanes
 - group: infrastructure
-  version: v1alpha4
+  version: v1beta1
   kind: AWSManagedCluster
-# v1beta1 types
+# v1beta2 types
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSMachine
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSCluster
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSMachineTemplate
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSClusterStaticIdentity
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSClusterRoleIdentity
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSClusterControllerIdentity
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSClusterTemplate
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSManagedControlPlanes
 - group: infrastructure
-  version: v1beta1
+  version: v1beta2
   kind: AWSManagedCluster