Merge pull request #50 from onmetal/fix/lb_del_path

Cached LB Server should be deletable without VNI information

Author: guvenc

controllers/loadbalancer_controller.go

@@ -95,10 +95,15 @@ func (r *LoadBalancerReconciler) delete(ctx context.Context, log logr.Logger, lb
 
 	log.V(1).Info("Getting dpdk loadbalancer")
 	dpdkLoadBalancer, err := r.DPDK.GetLoadBalancer(ctx, lb.UID)
+	ip := lb.Spec.IP.Addr.String()
 	if err != nil {
 		if !dpdk.IsStatusErrorCode(err, dpdk.NOT_FOUND) {
 			return ctrl.Result{}, fmt.Errorf("error getting dpdk loadbalancer: %w", err)
 		}
+		log.V(1).Info("Remove LoadBalancer server", "ip", ip)
+		if err := r.MBInternal.RemoveLoadBalancerServer(ip, lb.UID); err != nil {
+			return ctrl.Result{}, fmt.Errorf("error deleting dpdk loadbalancer from internal cache: %w", err)
+		}
 		log.V(1).Info("No dpdk loadbalancer, removing finalizer")
 		if err := clientutils.PatchRemoveFinalizer(ctx, r.Client, lb, loadBalancerFinalizer); err != nil {
 			return ctrl.Result{}, fmt.Errorf("error removing finalizer: %w", err)
@@ -109,36 +114,16 @@ func (r *LoadBalancerReconciler) delete(ctx context.Context, log logr.Logger, lb
 	}
 
 	vni := dpdkLoadBalancer.Spec.VNI
-	ip := lb.Spec.IP.Addr.String()
 	underlayRoute := dpdkLoadBalancer.Status.UnderlayRoute
 	log.V(1).Info("Got dpdk LoadBalancer", "VNI", vni, "UnderlayRoute", underlayRoute)
 
-	if err != nil {
-		if !dpdk.IsStatusErrorCode(err, dpdk.NOT_FOUND) {
-			return ctrl.Result{}, fmt.Errorf("error getting dpdk loadbalancer: %w", err)
-		}
-
-		log.V(1).Info("Remove LoadBalancer server", "vni", vni, "ip", ip)
-		if err := r.MBInternal.RemoveLoadBalancerServer(vni, ip, lb.UID); err != nil {
-			return ctrl.Result{}, fmt.Errorf("error deleting dpdk loadbalancer from internal cache: %w", err)
-		}
-
-		log.V(1).Info("No dpdk loadbalancer, removing finalizer")
-		if err := clientutils.PatchRemoveFinalizer(ctx, r.Client, lb, loadBalancerFinalizer); err != nil {
-			return ctrl.Result{}, fmt.Errorf("error removing finalizer: %w", err)
-		}
-		log.V(1).Info("Removed finalizer")
-
-		return ctrl.Result{}, nil
-	}
-
 	log.V(1).Info("Deleting LoadBalancer")
 	if err := r.deleteLoadBalancer(ctx, log, lb, vni, underlayRoute); err != nil {
 		return ctrl.Result{}, fmt.Errorf("error deleting underlay route: %w", err)
 	}
 	log.V(1).Info("Deleted Loadbalancer")
 	log.V(1).Info("Remove LoadBalancer server", "vni", vni, "ip", ip)
-	if err := r.MBInternal.RemoveLoadBalancerServer(vni, ip, lb.UID); err != nil {
+	if err := r.MBInternal.RemoveLoadBalancerServer(ip, lb.UID); err != nil {
 		return ctrl.Result{}, fmt.Errorf("error deleting dpdk loadbalancer from internal cache: %w", err)
 	}
 

dpdkmetalbond/dpdkmetalbond.go

@@ -31,7 +31,7 @@ type MbInternalAccess interface {
 	AddRoute(vni mb.VNI, dest mb.Destination, hop mb.NextHop) error
 	RemoveRoute(vni mb.VNI, dest mb.Destination, hop mb.NextHop) error
 	AddLoadBalancerServer(vni uint32, ip string, uid types.UID) error
-	RemoveLoadBalancerServer(vni uint32, ip string, uid types.UID) error
+	RemoveLoadBalancerServer(ip string, uid types.UID) error
 	IsVniPeered(vni uint32) bool
 	GetPeerVnis(vni uint32) (sets.Set[uint32], error)
 	AddVniToPeerVnis(log logr.Logger, vni, peeredVNI uint32) error
@@ -106,9 +106,13 @@ func (c *Client) AddLoadBalancerServer(vni uint32, ip string, uid types.UID) err
 	return nil
 }
 
-func (c *Client) RemoveLoadBalancerServer(vni uint32, ip string, uid types.UID) error {
-	if _, exists := c.lbServerMap[vni]; exists {
-		delete(c.lbServerMap[vni], ip)
+func (c *Client) RemoveLoadBalancerServer(ip string, uid types.UID) error {
+	for _, innerMap := range c.lbServerMap {
+		for keyIp, value := range innerMap {
+			if ip == keyIp && value == uid {
+				delete(innerMap, ip)
+			}
+		}
 	}
 	return nil
 }