Fixes leftover podref issue

Signed-off-by: Muhammad Adil Ghaffar <[email protected]>

Author: adilGhaffarDev

pkg/controlloop/pod.go

@@ -224,17 +224,10 @@ func (pc *PodController) garbageCollectPodIPs(pod *v1.Pod) error {
 				if allocation.PodRef == podID(podNamespace, podName) {
 					logging.Verbosef("stale allocation to cleanup: %+v", allocation)
 
-					client := *wbclient.NewKubernetesClient(nil, pc.k8sClient)
-					wbClient := &wbclient.KubernetesIPAM{
-						Client: client,
-						Config: *ipamConfig,
-					}
+					client := *wbclient.NewKubernetesClient(pc.wbClient, pc.k8sClient)
+					k8sIPAM := wbclient.NewKubernetesIPAMWithClient(allocation.ContainerID, allocation.IfName, *ipamConfig, pool.Namespace, client)
 
-					if err != nil {
-						logging.Debugf("error while generating the IPAM client: %v", err)
-						continue
-					}
-					if _, err := pc.cleanupFunc(context.TODO(), types.Deallocate, *ipamConfig, wbClient); err != nil {
+					if _, err := pc.cleanupFunc(context.TODO(), types.Deallocate, *ipamConfig, k8sIPAM); err != nil {
 						logging.Errorf("failed to cleanup allocation: %v", err)
 					}
 					if err := pc.addressGarbageCollected(pod, nad.GetName(), pool.Spec.Range, allocationIndex); err != nil {
@@ -244,7 +237,6 @@ func (pc *PodController) garbageCollectPodIPs(pod *v1.Pod) error {
 			}
 		}
 	}
-
 	return nil
 }
 

pkg/storage/kubernetes/ipam.go

@@ -70,6 +70,17 @@ func NewKubernetesIPAM(containerID, ifName string, ipamConf whereaboutstypes.IPA
 	return k8sIPAM, nil
 }
 
+// NewKubernetesIPAMWithClient returns a new KubernetesIPAM Client configured to a kubernetes CRD backend
+func NewKubernetesIPAMWithClient(containerID, ifName string, ipamConf whereaboutstypes.IPAMConfig, namespace string, kubernetesClient Client) *KubernetesIPAM {
+	return &KubernetesIPAM{
+		Config:      ipamConf,
+		containerID: containerID,
+		IfName:      ifName,
+		namespace:   namespace,
+		Client:      kubernetesClient,
+	}
+}
+
 // NewKubernetesIPAMWithNamespace returns a new KubernetesIPAM Client configured to a kubernetes CRD backend
 func NewKubernetesIPAMWithNamespace(containerID, ifName string, ipamConf whereaboutstypes.IPAMConfig, namespace string) (*KubernetesIPAM, error) {
 	k8sIPAM, err := NewKubernetesIPAM(containerID, ifName, ipamConf)
@@ -180,7 +191,7 @@ type KubernetesIPPool struct {
 
 // Allocations returns the initially retrieved set of allocations for this pool
 func (p *KubernetesIPPool) Allocations() []whereaboutstypes.IPReservation {
-	return toIPReservationList(p.pool.Spec.Allocations, p.firstIP)
+	return ToIPReservationList(p.pool.Spec.Allocations, p.firstIP)
 }
 
 // Update sets the pool allocated IP list to the given IP reservations
@@ -240,7 +251,7 @@ func (p *KubernetesIPPool) Update(ctx context.Context, reservations []whereabout
 	return nil
 }
 
-func toIPReservationList(allocations map[string]whereaboutsv1alpha1.IPAllocation, firstip net.IP) []whereaboutstypes.IPReservation {
+func ToIPReservationList(allocations map[string]whereaboutsv1alpha1.IPAllocation, firstip net.IP) []whereaboutstypes.IPReservation {
 	reservelist := []whereaboutstypes.IPReservation{}
 	for offset, a := range allocations {
 		numOffset, err := strconv.ParseInt(offset, 10, 64)