Add CAPA additional tags to karpenter resources

Author: fiunchinho

controllers/controllersfakes/fake_awscluster_client.go

@@ -356,7 +356,7 @@ func (r *KarpenterMachinePoolReconciler) createOrUpdateKarpenterResources(ctx co
 	}
 
 	// Create or update EC2NodeClass
-	if err := r.createOrUpdateEC2NodeClass(ctx, logger, workloadClusterClient, cluster, awsCluster, karpenterMachinePool, bootstrapSecretValue); err != nil {
+	if err := r.createOrUpdateEC2NodeClass(ctx, logger, workloadClusterClient, awsCluster, karpenterMachinePool, bootstrapSecretValue); err != nil {
 		conditions.MarkEC2NodeClassNotReady(karpenterMachinePool, EC2NodeClassCreationFailedReason, err.Error())
 		return fmt.Errorf("failed to create or update EC2NodeClass: %w", err)
 	}
@@ -375,7 +375,7 @@ func (r *KarpenterMachinePoolReconciler) createOrUpdateKarpenterResources(ctx co
 }
 
 // createOrUpdateEC2NodeClass creates or updates the EC2NodeClass resource in the workload cluster
-func (r *KarpenterMachinePoolReconciler) createOrUpdateEC2NodeClass(ctx context.Context, logger logr.Logger, workloadClusterClient client.Client, cluster *capi.Cluster, awsCluster *capa.AWSCluster, karpenterMachinePool *v1alpha1.KarpenterMachinePool, bootstrapSecretValue []byte) error {
+func (r *KarpenterMachinePoolReconciler) createOrUpdateEC2NodeClass(ctx context.Context, logger logr.Logger, workloadClusterClient client.Client, awsCluster *capa.AWSCluster, karpenterMachinePool *v1alpha1.KarpenterMachinePool, bootstrapSecretValue []byte) error {
 	ec2NodeClassGVR := schema.GroupVersionResource{
 		Group:    EC2NodeClassAPIGroup,
 		Version:  "v1",
@@ -407,6 +407,7 @@ func (r *KarpenterMachinePoolReconciler) createOrUpdateEC2NodeClass(ctx context.
 			"securityGroupSelectorTerms": karpenterMachinePool.Spec.EC2NodeClass.SecurityGroupSelectorTerms,
 			"subnetSelectorTerms":        karpenterMachinePool.Spec.EC2NodeClass.SubnetSelectorTerms,
 			"userData":                   userData,
+			"tags":                       mergeMaps(awsCluster.Spec.AdditionalTags, karpenterMachinePool.Spec.EC2NodeClass.Tags),
 		}
 
 		ec2NodeClass.Object["spec"] = spec
@@ -427,6 +428,16 @@ func (r *KarpenterMachinePoolReconciler) createOrUpdateEC2NodeClass(ctx context.
 	return nil
 }
 
+func mergeMaps[A comparable, B any](maps ...map[A]B) map[A]B {
+	result := make(map[A]B)
+	for _, m := range maps {
+		for k, v := range m {
+			result[k] = v
+		}
+	}
+	return result
+}
+
 // createOrUpdateNodePool creates or updates the NodePool resource in the workload cluster
 func (r *KarpenterMachinePoolReconciler) createOrUpdateNodePool(ctx context.Context, logger logr.Logger, workloadClusterClient client.Client, cluster *capi.Cluster, karpenterMachinePool *v1alpha1.KarpenterMachinePool) error {
 	nodePoolGVR := schema.GroupVersionResource{

controllers/controllersfakes/fake_cluster_client.go

@@ -75,11 +75,6 @@ var _ = Describe("KarpenterMachinePool reconciler", func() {
 		err = karpenterinfra.AddToScheme(scheme.Scheme)
 		Expect(err).NotTo(HaveOccurred())
 
-		// fakeCtrlClient := fake.NewClientBuilder().
-		// 	WithScheme(scheme.Scheme).
-		// 	// WithStatusSubresource(&karpenterinfra.KarpenterMachinePool{}).
-		// 	Build()
-
 		workloadClusterClientGetter := func(ctx context.Context, _ string, _ client.Client, _ client.ObjectKey) (client.Client, error) {
 			// Return the same client that we're using for the test
 			return k8sClient, nil
@@ -592,6 +587,9 @@ var _ = Describe("KarpenterMachinePool reconciler", func() {
 									Tags: map[string]string{"my-target-subnet": "is-that"},
 								},
 							},
+							Tags: map[string]string{
+								"one-tag": "only-for-karpenter",
+							},
 						},
 						NodePool: &karpenterinfra.NodePoolSpec{
 							Template: karpenterinfra.NodeClaimTemplate{
@@ -807,6 +805,9 @@ var _ = Describe("KarpenterMachinePool reconciler", func() {
 									Name:      ClusterName,
 								},
 								Spec: capa.AWSClusterSpec{
+									AdditionalTags: map[string]string{
+										"additional-tag-for-all-resources": "custom-tag",
+									},
 									IdentityRef: &capa.AWSIdentityReference{
 										Name: "default",
 										Kind: capa.ClusterRoleIdentityKind,
@@ -885,6 +886,10 @@ var _ = Describe("KarpenterMachinePool reconciler", func() {
 
 								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "userData").To(Equal(fmt.Sprintf("{\"ignition\":{\"config\":{\"merge\":[{\"source\":\"s3://%s/karpenter-machine-pool/%s\",\"verification\":{}}],\"replace\":{\"verification\":{}}},\"proxy\":{},\"security\":{\"tls\":{}},\"timeouts\":{},\"version\":\"3.4.0\"},\"kernelArguments\":{},\"passwd\":{},\"storage\":{},\"systemd\":{}}", AWSClusterBucketName, KarpenterMachinePoolName)))
 								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "instanceProfile").To(Equal(KarpenterNodesInstanceProfile))
+								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "tags").
+									To(HaveKeyWithValue("additional-tag-for-all-resources", "custom-tag"))
+								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "tags").
+									To(HaveKeyWithValue("one-tag", "only-for-karpenter"))
 
 								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "blockDeviceMappings").To(HaveLen(1))
 								ExpectUnstructured(ec2nodeclassList.Items[0], "spec", "blockDeviceMappings").To(
@@ -1283,8 +1288,7 @@ var _ = Describe("KarpenterMachinePool reconciler", func() {
 	})
 })
 
-// ExpectUnstructured digs into u.Object at the given path,
-// asserts that it was found and error‐free, and returns
+// ExpectUnstructured digs into u.Object at the given path, asserts that it was found and error‐free, and returns
 // a GomegaAssertion on the raw interface{} value.
 func ExpectUnstructured(u unstructured.Unstructured, fields ...string) Assertion {
 	v, found, err := unstructured.NestedFieldNoCopy(u.Object, fields...)