Add crossplane config controller (#260)

* Add crossplane config controller

* Don't fail during teardown if aws resources don't exist

* Remove providerRole parameter, because it can be computed at runtime

* Rename reconciler

* Change managed-by label

Author: fiunchinho

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add crossplane controller to create crossplane provider cluster config.
+
 ## [0.18.0] - 2025-06-16
 
 ### Added

controllers/controllers_suite_test.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"go/build"
 	"math/rand"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -34,6 +35,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/scheme"
 	capa "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	eks "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
 	capi "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -81,10 +83,14 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	By("bootstrapping test environment")
+	ex, err := os.Executable()
+	Expect(err).NotTo(HaveOccurred())
+	crdPath := filepath.Join(filepath.Dir(ex), "..", "tests", "testdata", "crds")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
 			filepath.Join(build.Default.GOPATH, "pkg", "mod", "sigs.k8s.io", fmt.Sprintf("cluster-api@%s", capiModule[0].Module.Version), "config", "crd", "bases"),
 			filepath.Join(build.Default.GOPATH, "pkg", "mod", "sigs.k8s.io", "cluster-api-provider-aws", fmt.Sprintf("v2@%s", capaModule[0].Module.Version), "config", "crd", "bases"),
+			crdPath,
 		},
 		ErrorIfCRDPathMissing: true,
 	}
@@ -98,7 +104,9 @@ var _ = BeforeSuite(func() {
 
 	err = capi.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	// +kubebuilder:scaffold:scheme
+
+	err = eks.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())
@@ -194,21 +202,6 @@ func createRandomClusterWithIdentity(annotationsKeyValues ...string) (*capa.AWSC
 	return identity, awsCluster
 }
 
-func newRoleIdentity() *capa.AWSClusterRoleIdentity {
-	name := uuid.NewString()
-	return &capa.AWSClusterRoleIdentity{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: namespace,
-		},
-		Spec: capa.AWSClusterRoleIdentitySpec{
-			AWSRoleSpec: capa.AWSRoleSpec{
-				RoleArn: uuid.NewString(),
-			},
-		},
-	}
-}
-
 func newSubnetSpec(id, availabilityZone string, transitGatewayTagged bool) capa.SubnetSpec {
 	subnet := capa.SubnetSpec{
 		ID:               id,
@@ -224,3 +217,172 @@ func newSubnetSpec(id, availabilityZone string, transitGatewayTagged bool) capa.
 
 	return subnet
 }
+
+func newCapiCluster(name string, annotationsKeyValues ...string) *capi.Cluster {
+	if len(annotationsKeyValues)%2 != 0 {
+		Fail("wrong number of arguments for newCluster. Expected even number of arguments for annotation key/value pairs")
+	}
+
+	annotations := map[string]string{}
+	for i := 0; i < len(annotationsKeyValues); i += 2 {
+		annotations[annotationsKeyValues[i]] = annotationsKeyValues[i+1]
+	}
+
+	awsCluster := &capi.Cluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        name,
+			Namespace:   namespace,
+			Annotations: annotations,
+		},
+	}
+
+	return awsCluster
+}
+
+func newCapaCluster(name string, annotationsKeyValues ...string) *capa.AWSCluster {
+	if len(annotationsKeyValues)%2 != 0 {
+		Fail("wrong number of arguments for newCluster. Expected even number of arguments for annotation key/value pairs")
+	}
+
+	annotations := map[string]string{}
+	for i := 0; i < len(annotationsKeyValues); i += 2 {
+		annotations[annotationsKeyValues[i]] = annotationsKeyValues[i+1]
+	}
+
+	awsCluster := &capa.AWSCluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        name,
+			Namespace:   namespace,
+			Annotations: annotations,
+		},
+		Spec: capa.AWSClusterSpec{
+			Region: "the-region",
+			NetworkSpec: capa.NetworkSpec{
+				VPC: capa.VPCSpec{
+					ID:        "vpc-1",
+					CidrBlock: fmt.Sprintf("10.%d.0.0/24", rand.Intn(255)),
+				},
+				Subnets: capa.Subnets{
+					{
+						ID:       "sub-1",
+						IsPublic: false,
+					},
+				},
+			},
+		},
+	}
+
+	return awsCluster
+}
+
+func newEksCluster(name string, annotationsKeyValues ...string) *eks.AWSManagedControlPlane {
+	if len(annotationsKeyValues)%2 != 0 {
+		Fail("wrong number of arguments for newCluster. Expected even number of arguments for annotation key/value pairs")
+	}
+
+	annotations := map[string]string{}
+	for i := 0; i < len(annotationsKeyValues); i += 2 {
+		annotations[annotationsKeyValues[i]] = annotationsKeyValues[i+1]
+	}
+
+	eksCluster := &eks.AWSManagedControlPlane{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        name,
+			Namespace:   namespace,
+			Annotations: annotations,
+		},
+		Spec: eks.AWSManagedControlPlaneSpec{
+			Region: "the-region",
+			ControlPlaneEndpoint: capi.APIEndpoint{
+				Host: "https://eks123clusterID.sk1.eu-west-2.eks.amazonaws.com",
+				Port: 443,
+			},
+			NetworkSpec: capa.NetworkSpec{
+				VPC: capa.VPCSpec{
+					ID:        "vpc-1",
+					CidrBlock: fmt.Sprintf("10.%d.0.0/24", rand.Intn(255)),
+				},
+				Subnets: capa.Subnets{
+					{
+						ID:       "sub-1",
+						IsPublic: false,
+					},
+				},
+			},
+		},
+	}
+
+	return eksCluster
+}
+
+func createRandomCapaClusterWithIdentity(annotationsKeyValues ...string) (*capa.AWSClusterRoleIdentity, *capa.AWSCluster, *capi.Cluster) {
+	name := uuid.NewString()
+	awsCluster := newCapaCluster(name, annotationsKeyValues...)
+	capiCluster := newCapiCluster(name, annotationsKeyValues...)
+	identity := newRoleIdentity()
+
+	awsCluster.Spec.IdentityRef = &capa.AWSIdentityReference{
+		Name: identity.Name,
+		Kind: "AWSClusterRoleIdentity",
+	}
+
+	Expect(k8sClient.Create(context.Background(), capiCluster)).To(Succeed())
+	tests.PatchCAPIClusterStatus(k8sClient, capiCluster, capi.ClusterStatus{
+		Phase: "Running",
+	})
+
+	Expect(k8sClient.Create(context.Background(), awsCluster)).To(Succeed())
+	Expect(k8sClient.Create(context.Background(), identity)).To(Succeed())
+	tests.PatchAWSClusterStatus(k8sClient, awsCluster, capa.AWSClusterStatus{
+		Ready: true,
+	})
+
+	return identity, awsCluster, capiCluster
+}
+
+func createRandomAwsManagedControlplaneWithIdentity(annotationsKeyValues ...string) (*capa.AWSClusterRoleIdentity, *eks.AWSManagedControlPlane, *capi.Cluster) {
+	name := uuid.NewString()
+	eksCluster := newEksCluster(name, annotationsKeyValues...)
+	capiCluster := newCapiCluster(name, annotationsKeyValues...)
+	identity := newRoleIdentity()
+
+	capiCluster.Spec.InfrastructureRef = &corev1.ObjectReference{
+		Kind: "AWSManagedCluster",
+	}
+	capiCluster.Spec.ControlPlaneRef = &corev1.ObjectReference{
+		Kind: "AWSManagedControlPlane",
+	}
+
+	eksCluster.Spec.IdentityRef = &capa.AWSIdentityReference{
+		Name: identity.Name,
+		Kind: "AWSClusterRoleIdentity",
+	}
+
+	Expect(k8sClient.Create(context.Background(), capiCluster)).To(Succeed())
+	tests.PatchCAPIClusterStatus(k8sClient, capiCluster, capi.ClusterStatus{
+		Phase: "Running",
+	})
+
+	Expect(k8sClient.Create(context.Background(), eksCluster)).To(Succeed())
+	Expect(k8sClient.Create(context.Background(), identity)).To(Succeed())
+	tests.PatchEKSClusterStatus(k8sClient, eksCluster, eks.AWSManagedControlPlaneStatus{
+		Ready: true,
+	})
+
+	return identity, eksCluster, capiCluster
+}
+
+func newRoleIdentity() *capa.AWSClusterRoleIdentity {
+	name := uuid.NewString()
+	return &capa.AWSClusterRoleIdentity{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Spec: capa.AWSClusterRoleIdentitySpec{
+			AWSRoleSpec: capa.AWSRoleSpec{
+				RoleArn: fmt.Sprintf("arn:aws:iam::%d:role/%s", rand.Intn(1000000), name),
+			},
+		},
+	}
+}