datapath: Move NodeAddressing out from tables

NodeAddressing doesn't make sense to live in the tables package as it
isn't about defining a common StateDB table. It also introduces dependency
on the datapath types package which makes it impossible to use the tables
package types in datapath types.

Eventually whole NodeAddressing will be removed as it is just a wrapper around
LocalNodeStore and Table[Device], and a harmful one at that as it hides the
fact that the underlying data may change over time.

Signed-off-by: Jussi Maki <jussi@isovalent.com>

pkg/datapath/cells.go

@@ -81,7 +81,7 @@ var Cell = cell.Module(
 	tables.NodeAddressCell,
 
 	// Provides the legacy accessor for the above, the NodeAddressing interface.
-	tables.NodeAddressingCell,
+	NodeAddressingCell,
 
 	// This cell periodically updates the agent liveness value in configmap.Map to inform
 	// the datapath of the liveness of the agent.

pkg/datapath/fake/cells.go

@@ -11,6 +11,7 @@ import (
 	"github.com/cilium/statedb"
 	"golang.org/x/sys/unix"
 
+	"github.com/cilium/cilium/pkg/datapath"
 	fakeTypes "github.com/cilium/cilium/pkg/datapath/fake/types"
 	"github.com/cilium/cilium/pkg/datapath/iptables"
 	"github.com/cilium/cilium/pkg/datapath/iptables/ipset"
@@ -64,7 +65,7 @@ var Cell = cell.Module(
 	),
 
 	tables.NodeAddressCell,
-	tables.NodeAddressingCell,
+	datapath.NodeAddressingCell,
 
 	cell.Invoke(
 		statedb.RegisterTable[*tables.Device],

pkg/datapath/tables/node_addressing.go → pkg/datapath/node_addressing.go

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Authors of Cilium
 
-package tables
+package datapath
 
 import (
 	"context"
@@ -11,6 +11,7 @@ import (
 	"github.com/cilium/statedb"
 
 	"github.com/cilium/cilium/pkg/cidr"
+	"github.com/cilium/cilium/pkg/datapath/tables"
 	"github.com/cilium/cilium/pkg/datapath/types"
 	"github.com/cilium/cilium/pkg/node"
 	"github.com/cilium/cilium/pkg/option"
@@ -26,7 +27,7 @@ var NodeAddressingCell = cell.Module(
 	cell.Provide(NewNodeAddressing),
 )
 
-func NewNodeAddressing(localNode *node.LocalNodeStore, db *statedb.DB, devices statedb.Table[*Device]) types.NodeAddressing {
+func NewNodeAddressing(localNode *node.LocalNodeStore, db *statedb.DB, devices statedb.Table[*tables.Device]) types.NodeAddressing {
 	return &nodeAddressing{
 		localNode: localNode,
 		db:        db,
@@ -37,7 +38,7 @@ func NewNodeAddressing(localNode *node.LocalNodeStore, db *statedb.DB, devices s
 type nodeAddressing struct {
 	localNode *node.LocalNodeStore
 	db        *statedb.DB
-	devices   statedb.Table[*Device]
+	devices   statedb.Table[*tables.Device]
 }
 
 func (n *nodeAddressing) IPv6() types.NodeAddressingFamily {
@@ -90,7 +91,7 @@ func (a addressFamily) getDirectRouting(flags getFlags) (int, net.IP, bool) {
 		return 0, nil, false
 	}
 
-	dev, _, ok := a.devices.Get(a.db.ReadTxn(), DeviceNameIndex.Query(option.Config.DirectRoutingDevice))
+	dev, _, ok := a.devices.Get(a.db.ReadTxn(), tables.DeviceNameIndex.Query(option.Config.DirectRoutingDevice))
 	if !ok {
 		return 0, nil, false
 	}