Enable clusterctl upgrade test

Author: sedefsavas

Makefile

@@ -213,6 +213,10 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 		paths=./bootstrap/eks/api/... \
 		paths=./controlplane/eks/api/... \
 		paths=./iam/api/... \
+		paths=./controllers/... \
+		paths=./$(EXP_DIR)/controllers/... \
+		paths=./bootstrap/eks/controllers/... \
+		paths=./controlplane/eks/controllers/... \
 		output:crd:dir=config/crd/bases \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		crd:crdVersions=v1 \

api/v1beta1/awscluster_conversion.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1beta1/awsidentity_conversion.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1beta1/awsmachine_conversion.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

test/e2e/data/e2e_conf.yaml

@@ -84,7 +84,7 @@ providers:
   - name: aws
     type: InfrastructureProvider
     versions:
-      - name: v1.5.0 # latest published release in the v1alpha4 series; this is used for v1beta1 --> v1beta2 clusterctl upgrades test only.
+      - name: v1.5.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta2 clusterctl upgrades test only.
         value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v1.5.0/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
@@ -94,7 +94,7 @@ providers:
       - name: v1.6.99
         # Use manifest from source files
         value: ../../../config/default
-        contract: v1beta1
+        # Do not add contract field for v1beta1 --> v1beta2 clusterctl upgrades test to work.
         files:
           - sourcePath: "./infrastructure-aws/generated/cluster-template-efs-support.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-external-csi.yaml"

test/e2e/suites/unmanaged/unmanaged_CAPI_test.go

@@ -110,8 +110,7 @@ var _ = ginkgo.Context("[unmanaged] [Cluster API Framework]", func() {
 		})
 	})
 
-	// TODO: clusterctl init uses v1beta2, this needs to be fixed.
-	ginkgo.PDescribe("Clusterctl Upgrade Spec [from latest v1beta1 release to v1beta2]", func() {
+	ginkgo.Describe("Clusterctl Upgrade Spec [from latest v1beta1 release to v1beta2]", func() {
 		ginkgo.BeforeEach(func() {
 			// As the resources cannot be defined by the It() clause in CAPI tests, using the largest values required for all It() tests in this CAPI test.
 			requiredResources = &shared.TestResource{EC2Normal: 5 * e2eCtx.Settings.InstanceVCPU, IGW: 2, NGW: 2, VPC: 2, ClassicLB: 2, EIP: 2}