Merge pull request #3720 from sedefsavas/v1beta2_latest

v1beta2 APIs

Author: k8s-ci-robot

.golangci.yml

@@ -85,33 +85,25 @@ linters-settings:
         alias: utilconversion
       - pkg: k8s.io/apimachinery/pkg/conversion
         alias: apiconversion
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta2
         alias: infrav1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha3
-        alias: expinfrav1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha4
-        alias: expinfrav1alpha4
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta1
+        alias: infrav1beta1
       - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1
+        alias: expinfrav1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta2
         alias: expinfrav1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4
-        alias: infrav1alpha4
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3
-        alias: infrav1alpha3
       - pkg: k8s.io/client-go/kubernetes/scheme
         alias: cgscheme
       - pkg: k8s.io/client-go/tools/record
         alias: cgrecord
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1alpha3
-        alias: eksbootstrapv1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1alpha4
-        alias: eksbootstrapv1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta1
+        alias: eksbootstrapv1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta2
         alias: eksbootstrapv1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1alpha3
-        alias: ekscontrolplanev1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1alpha4
-        alias: ekscontrolplanev1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta1
+        alias: ekscontrolplanev1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta2
         alias: ekscontrolplanev1
       - pkg: "sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/controllers"
         alias: eksbootstrapcontrollers
@@ -125,10 +117,6 @@ linters-settings:
         alias: runtimeserializer
       - pkg: "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
         alias: yamlserializer
-      - pkg:  "sigs.k8s.io/cluster-api/api/v1alpha3"
-        alias: clusterv1alpha3
-      - pkg:  "sigs.k8s.io/cluster-api/api/v1alpha4"
-        alias: clusterv1alpha4
       - pkg: "sigs.k8s.io/cluster-api/api/v1beta1"
         alias: clusterv1
       - pkg: "sigs.k8s.io/cluster-api/util/defaulting"
@@ -210,7 +198,7 @@ issues:
     - linters:
       - godot
       text: "Comment should end in a period"
-      path: "(.*)/(v1alpha3|v1alpha4|v1alpha1)/(.*)types.go"
+      path: "(.*)/(v1beta1|v1beta2)/(.*)types.go"
     - linters:
       - errcheck
       text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked

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 \
@@ -202,6 +200,7 @@ generate-go: $(MOCKGEN)
 
 .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
@@ -214,20 +213,15 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 		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) \
+		output:crd:dir=config/crd/bases \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
-		rbac:roleName=manager-role
+		crd:crdVersions=v1 \
+		rbac:roleName=manager-role \
+		webhook
 
 	$(CONTROLLER_GEN) \
 		paths=./cmd/... \
@@ -236,44 +230,33 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 	$(MAKE) defaulters
 
 	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1alpha3 \
-		--input-dirs=./api/v1alpha4 \
+		--input-dirs=./api/v1beta1 \
 		--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 \
+		--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/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 \
+		--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=./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 \
+		--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=./$(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 \
+		--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
@@ -694,4 +677,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