Add EKS and EXP v1beta2 APIs

Co-authored-by: Ankita Swamy <[email protected]>
Co-authored-by: Sedef Savas <[email protected]>

Author: 3 people

Makefile

@@ -207,55 +207,55 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 	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/... \
-#		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
+	$(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 $@
 
@@ -386,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 ./api/...
+	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test ./controlplane/eks/api/...
 
 .PHONY: test-verbose
 test-verbose: setup-envtest ## Run tests with verbose settings.

api/v1beta1/zz_generated.deepcopy.go

@@ -1,25 +1,18 @@
 domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks
 resources:
-# v1alpha3 types
-- group: bootstrap
-  kind: EKSConfig
-  version: v1alpha3
-- group: bootstrap
-  kind: EKSConfigTemplate
-  version: v1alpha3
-# v1alpha4 types
+# v1beta1 types
 - group: bootstrap
   kind: EKSConfig
-  version: v1alpha4
+  version: v1beta1
 - group: bootstrap
   kind: EKSConfigTemplate
-  version: v1alpha4
-# v1beta1 types
+  version: v1beta1
+# v1beta2 types
 - group: bootstrap
   kind: EKSConfig
-  version: v1beta1
+  version: v1beta2
 - group: bootstrap
   kind: EKSConfigTemplate
-  version: v1beta1
+  version: v1beta2
 version: "2"