Ensure IPAddress has a ClusterName label as CAPI resources

Signed-off-by: Gong Zhang <[email protected]>

Author: zhanggbj

internal/controllers/ipaddressclaim.go

@@ -354,6 +354,12 @@ func (r *IPAddressClaimReconciler) allocateAddress(claim *ipamv1.IPAddressClaim,
 	address.Spec.Gateway = poolSpec.Gateway
 	address.Spec.Prefix = poolSpec.Prefix
 
+	// Ensure the IPAddress has a ClusterNameLabel that can be used when searching for
+	// resources associated with the target cluster.
+	if val, ok := claim.Labels[clusterv1.ClusterNameLabel]; ok {
+		address.Labels[clusterv1.ClusterNameLabel] = val
+	}
+
 	return &address, nil
 }
 

internal/controllers/ipaddressclaim_test.go

@@ -90,7 +90,10 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 		})
 
 		When("the referenced namespaced pool exists", func() {
-			const poolName = "test-pool"
+			const (
+				clusterName = "test-cluster"
+				poolName    = "test-pool"
+			)
 
 			BeforeEach(func() {
 				pool := v1alpha2.InClusterIPPool{
@@ -115,6 +118,7 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 
 			It("should allocate an Address from the Pool", func() {
 				claim := newClaim("test", namespace, "InClusterIPPool", poolName)
+				claim.Labels = map[string]string{clusterv1.ClusterNameLabel: clusterName}
 				expectedIPAddress := ipamv1.IPAddress{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "test",
@@ -136,6 +140,7 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 								Name:               poolName,
 							},
 						},
+						Labels: map[string]string{clusterv1.ClusterNameLabel: clusterName},
 					},
 					Spec: ipamv1.IPAddressSpec{
 						ClaimRef: corev1.LocalObjectReference{