claims: Filter ipamclaim lookup according namespace

Currently looking for matching ipam claims is done only according the owning VM name. It means that when removing finalizer, we will remove the finalizer from ipam claims with the same owning VM name across all namespaces, which is wrong. Fix it by limiting the search to the specific VM namespace. Signed-off-by: Or Shoval <[email protected]>
kubevirt · Jul 9, 2024 · cf3cdcf · cf3cdcf
1 parent f53ba76
commit cf3cdcf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/vminetworkscontroller/vmi_controller.go b/pkg/vminetworkscontroller/vmi_controller.go
@@ -209,7 +209,11 @@ func (r *VirtualMachineInstanceReconciler) vmiNetworksClaimingIPAM(
 
 func (r *VirtualMachineInstanceReconciler) Cleanup(vmiKey apitypes.NamespacedName) error {
 	ipamClaims := &ipamclaimsapi.IPAMClaimList{}
-	if err := r.Client.List(context.Background(), ipamClaims, ownedByVMLabel(vmiKey.Name)); err != nil {
+	listOpts := []client.ListOption{
+		client.InNamespace(vmiKey.Namespace),
+		ownedByVMLabel(vmiKey.Name),
+	}
+	if err := r.Client.List(context.Background(), ipamClaims, listOpts...); err != nil {
 		return fmt.Errorf("could not get list of IPAMClaims owned by VM %q: %w", vmiKey.String(), err)
 	}