Merge pull request #99 from tylerschultz/global-pools-find-all-in-use-ips

Fix GlobalPools determination of in use IPs

Author: schrej

internal/controllers/ipaddressclaim.go

@@ -142,8 +142,7 @@ func (r *IPAddressClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	if !claim.ObjectMeta.DeletionTimestamp.IsZero() {
 		return r.reconcileDelete(ctx, claim, address)
 	}
-
-	addressesInUse, err := poolutil.ListAddressesInUse(ctx, r.Client, claim.Namespace, claim.Spec.PoolRef)
+	addressesInUse, err := poolutil.ListAddressesInUse(ctx, r.Client, pool.GetNamespace(), claim.Spec.PoolRef)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to list addresses: %w", err)
 	}

internal/controllers/ipaddressclaim_test.go

@@ -362,29 +362,31 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 
 		When("the referenced global pool exists", func() {
 			const poolName = "global-pool"
-
+			var secondNamespace string
 			BeforeEach(func() {
 				pool := v1alpha1.GlobalInClusterIPPool{
 					ObjectMeta: metav1.ObjectMeta{ // global pool, no namespace
 						Name: poolName,
 					},
 					Spec: v1alpha1.InClusterIPPoolSpec{
-						First:   "10.0.0.1",
+						First:   "10.0.0.2",
 						Last:    "10.0.0.254",
 						Prefix:  24,
-						Gateway: "10.0.0.2",
+						Gateway: "10.0.0.1",
 					},
 				}
 				Expect(k8sClient.Create(context.Background(), &pool)).To(Succeed())
 				Eventually(Get(&pool)).Should(Succeed())
+				secondNamespace = createNamespace()
 			})
 
 			AfterEach(func() {
 				deleteClusterScopedPool(poolName)
 				deleteClaim("test", namespace)
+				deleteClaim("test-second-namespace", secondNamespace)
 			})
 
-			It("should allocate an Address from the Pool", func() {
+			It("should allocate an Address from the Pool, no matter the claim's namespace", func() {
 				claim := clusterv1.IPAddressClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "test",
@@ -399,6 +401,20 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 					},
 				}
 
+				claimFromSecondNamespace := clusterv1.IPAddressClaim{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-second-namespace",
+						Namespace: secondNamespace,
+					},
+					Spec: clusterv1.IPAddressClaimSpec{
+						PoolRef: corev1.TypedLocalObjectReference{
+							APIGroup: pointer.String("ipam.cluster.x-k8s.io"),
+							Kind:     "GlobalInClusterIPPool",
+							Name:     poolName,
+						},
+					},
+				}
+
 				expectedIPAddress := clusterv1.IPAddress{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:       "test",
@@ -430,25 +446,74 @@ var _ = Describe("IPAddressClaimReconciler", func() {
 							Kind:     "GlobalInClusterIPPool",
 							Name:     poolName,
 						},
-						Address: "10.0.0.1",
+						Address: "10.0.0.2",
 						Prefix:  24,
-						Gateway: "10.0.0.2",
+						Gateway: "10.0.0.1",
 					},
 				}
 
+				expectedIPAddressInSecondNamespace := clusterv1.IPAddress{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:       "test-second-namespace",
+						Namespace:  secondNamespace,
+						Finalizers: []string{ProtectAddressFinalizer},
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								APIVersion:         "ipam.cluster.x-k8s.io/v1alpha1",
+								BlockOwnerDeletion: pointer.Bool(true),
+								Controller:         pointer.Bool(true),
+								Kind:               "IPAddressClaim",
+								Name:               "test-second-namespace",
+							},
+							{
+								APIVersion:         "ipam.cluster.x-k8s.io/v1alpha1",
+								BlockOwnerDeletion: pointer.Bool(true),
+								Controller:         pointer.Bool(false),
+								Kind:               "GlobalInClusterIPPool",
+								Name:               poolName,
+							},
+						},
+					},
+					Spec: clusterv1.IPAddressSpec{
+						ClaimRef: corev1.LocalObjectReference{
+							Name: "test-second-namespace",
+						},
+						PoolRef: corev1.TypedLocalObjectReference{
+							APIGroup: pointer.String("ipam.cluster.x-k8s.io"),
+							Kind:     "GlobalInClusterIPPool",
+							Name:     poolName,
+						},
+						Address: "10.0.0.3",
+						Prefix:  24,
+						Gateway: "10.0.0.1",
+					},
+				}
 				Expect(k8sClient.Create(context.Background(), &claim)).To(Succeed())
+				Expect(k8sClient.Create(context.Background(), &claimFromSecondNamespace)).To(Succeed())
 
-				address := clusterv1.IPAddress{
+				expectedAddress := clusterv1.IPAddress{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "test",
 						Namespace: namespace,
 					},
 				}
 
-				Eventually(Object(&address)).
+				Eventually(Object(&expectedAddress)).
 					WithTimeout(time.Second).WithPolling(100 * time.Millisecond).Should(
 					EqualObject(&expectedIPAddress, IgnoreAutogeneratedMetadata, IgnoreUIDsOnIPAddress),
 				)
+
+				actualAddressFromSecondNamespace := clusterv1.IPAddress{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-second-namespace",
+						Namespace: secondNamespace,
+					},
+				}
+
+				Eventually(Object(&actualAddressFromSecondNamespace)).
+					WithTimeout(time.Second).WithPolling(100 * time.Millisecond).Should(
+					EqualObject(&expectedIPAddressInSecondNamespace, IgnoreAutogeneratedMetadata, IgnoreUIDsOnIPAddress),
+				)
 			})
 		})