Fix reabse issues

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 LABEL org.opencontainers.image.source=https://github.com/kubernetes-sigs/blixt
 LABEL org.opencontainers.image.description="An experimental layer 4 load-balancer built using eBPF/XDP with ebpf-go \

controllers/tcproute_controller.go

@@ -226,39 +226,13 @@ func (r *TCPRouteReconciler) ensureTCPRouteDeletedInDataPlane(ctx context.Contex
 		return err
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	// TODO: add multiple endpoint support https://github.com/Kong/blixt/issues/46
-	dataplaneClient, err := dataplane.NewDataPlaneClient(context.Background(), r.Client)
-	if err != nil {
-		return err
-	}
-
-	// since we currently only support one TCPRoute per Gateway, we can delete the vip (gateway)
-	// entry from the dataplane. this won't fly when we end up adding support for multiple TCPRoutes
-	// per Gateway.
-	confirmation, err := dataplaneClient.Delete(context.Background(), &dataplane.Vip{
+	vip := dataplane.Vip{
 		Ip:   gatewayIP,
 		Port: gwPort,
-	})
-	if err != nil {
-=======
-	// delete the target from the dataplane
-	if _, err = r.BackendsClientManager.Delete(ctx, targets.Vip); err != nil {
->>>>>>> 86c3e7e (Add support for multiple gRPC client management)
-=======
-	// TODO: add multiple endpoint support https://github.com/Kong/blixt/issues/46
-	dataplaneClient, err := dataplane.NewDataPlaneClient(context.Background(), r.Client)
-	if err != nil {
->>>>>>> d4cafa8 (Revert "Add support for multiple gRPC client management")
-		return err
 	}
 
-=======
->>>>>>> 7bdffd0 (Add dataplane controller and multi gRPC clients manager)
 	// delete the target from the dataplane
-	if _, err = r.BackendsClientManager.Delete(ctx, targets.Vip); err != nil {
+	if _, err = r.BackendsClientManager.Delete(ctx, &vip); err != nil {
 		return err
 	}
 
@@ -274,4 +248,5 @@ func (r *TCPRouteReconciler) ensureTCPRouteDeletedInDataPlane(ctx context.Contex
 	tcproute.SetFinalizers(newFinalizers)
 
 	return r.Client.Update(ctx, tcproute)
+
 }

controllers/udproute_controller.go

@@ -226,39 +226,13 @@ func (r *UDPRouteReconciler) ensureUDPRouteDeletedInDataPlane(ctx context.Contex
 		return err
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	// TODO: add multiple endpoint support https://github.com/Kong/blixt/issues/46
-	dataplaneClient, err := dataplane.NewDataPlaneClient(context.Background(), r.Client)
-	if err != nil {
-		return err
-	}
-
-	// since we currently only support one UDPRoute per Gateway, we can delete the vip (gateway)
-	// entry from the dataplane. this won't fly when we end up adding support for multiple UDPRoutes
-	// per Gateway.
-	confirmation, err := dataplaneClient.Delete(context.Background(), &dataplane.Vip{
+	vip := dataplane.Vip{
 		Ip:   gatewayIP,
 		Port: gwPort,
-	})
-	if err != nil {
-=======
-	// delete the target from the dataplane
-	if _, err = r.BackendsClientManager.Delete(ctx, targets.Vip); err != nil {
->>>>>>> 86c3e7e (Add support for multiple gRPC client management)
-=======
-	// TODO: add multiple endpoint support https://github.com/Kong/blixt/issues/46
-	dataplaneClient, err := dataplane.NewDataPlaneClient(context.Background(), r.Client)
-	if err != nil {
->>>>>>> d4cafa8 (Revert "Add support for multiple gRPC client management")
-		return err
 	}
 
-=======
->>>>>>> 7bdffd0 (Add dataplane controller and multi gRPC clients manager)
 	// delete the target from the dataplane
-	if _, err = r.BackendsClientManager.Delete(ctx, targets.Vip); err != nil {
+	if _, err = r.BackendsClientManager.Delete(ctx, &vip); err != nil {
 		return err
 	}