datapath: remove datapath abstraction

The datapath abstraction no longer provides access to datapath
related components.

Therefore, this commit removes the interface `types.Datapath` and
struct `linuxDatapath` - including all the referencing methods.

Signed-off-by: Marco Hofstetter <[email protected]>

Author: mhofstetter

Diff for: daemon/cmd/daemon.go

@@ -124,10 +124,6 @@ type Daemon struct {
 
 	mtuConfig mtu.MTU
 
-	// datapath is the underlying datapath implementation to use to
-	// implement all aspects of an agent
-	datapath datapath.Datapath
-
 	loader datapath.Loader
 
 	nodeAddressing datapath.NodeAddressing
@@ -368,7 +364,6 @@ func newDaemon(ctx context.Context, cleaner *daemonCleanup, params *daemonParams
 		buildEndpointSem:  semaphore.NewWeighted(int64(numWorkerThreads())),
 		compilationLock:   params.CompilationLock,
 		mtuConfig:         params.MTU,
-		datapath:          params.Datapath,
 		directRoutingDev:  params.DirectRoutingDevice,
 		loader:            params.Loader,
 		nodeAddressing:    params.NodeAddressing,

Diff for: daemon/cmd/daemon_main.go

@@ -1651,7 +1651,6 @@ type daemonParams struct {
 	Lifecycle              cell.Lifecycle
 	Health                 cell.Health
 	Clientset              k8sClient.Clientset
-	Datapath               datapath.Datapath
 	Loader                 datapath.Loader
 	WGAgent                *wireguard.Agent
 	LocalNodeStore         *node.LocalNodeStore

Diff for: daemon/cmd/daemon_test.go

@@ -299,10 +299,6 @@ func (ds *DaemonSuite) GetCIDRPrefixLengths() ([]int, []int) {
 	panic("GetCIDRPrefixLengths should not have been called")
 }
 
-func (ds *DaemonSuite) Datapath() datapath.Datapath {
-	return ds.d.datapath
-}
-
 func (ds *DaemonSuite) Loader() datapath.Loader {
 	return ds.d.loader
 }

Diff for: daemon/cmd/datapath.go

@@ -402,11 +402,6 @@ func setupRouteToVtepCidr() error {
 	return nil
 }
 
-// Datapath returns a reference to the datapath implementation.
-func (d *Daemon) Datapath() datapath.Datapath {
-	return d.datapath
-}
-
 // Loader returns a reference to the loader implementation.
 func (d *Daemon) Loader() datapath.Loader {
 	return d.loader

Diff for: pkg/datapath/cells.go

@@ -75,10 +75,9 @@ var Cell = cell.Module(
 	// Manages Cilium-specific iptables rules.
 	iptables.Cell,
 
-	cell.Provide(
-		newWireguardAgent,
-		newDatapath,
-	),
+	cell.Invoke(initDatapath),
+
+	cell.Provide(newWireguardAgent),
 
 	cell.Provide(func(expConfig experimental.Config) types.LBMap {
 		if expConfig.EnableExperimentalLB {
@@ -180,26 +179,14 @@ func newWireguardAgent(lc cell.Lifecycle, sysctl sysctl.Sysctl) *wg.Agent {
 	return wgAgent
 }
 
-func newDatapath(params datapathParams) types.Datapath {
-	datapath := linuxdatapath.NewDatapath(linuxdatapath.DatapathParams{})
-
-	params.LC.Append(cell.Hook{
+func initDatapath(logger *slog.Logger, lifecycle cell.Lifecycle) {
+	lifecycle.Append(cell.Hook{
 		OnStart: func(cell.HookContext) error {
-			if err := linuxdatapath.CheckRequirements(params.Log); err != nil {
+			if err := linuxdatapath.CheckRequirements(logger); err != nil {
 				return fmt.Errorf("requirements failed: %w", err)
 			}
 
 			return nil
 		},
 	})
-
-	return datapath
-}
-
-type datapathParams struct {
-	cell.In
-
-	Log *slog.Logger
-
-	LC cell.Lifecycle
 }

Diff for: pkg/datapath/fake/cells.go

@@ -43,10 +43,10 @@ var Cell = cell.Module(
 	"Fake Datapath",
 
 	cell.Provide(
-		func(lifecycle cell.Lifecycle, na types.NodeAddressing, nodeManager manager.NodeManager) (*fakeTypes.FakeDatapath, types.Datapath, types.NodeIDHandler, types.NodeHandler, types.NodeNeighbors, types.LBMap) {
+		func(lifecycle cell.Lifecycle, na types.NodeAddressing, nodeManager manager.NodeManager) (*fakeTypes.FakeDatapath, types.NodeIDHandler, types.NodeHandler, types.NodeNeighbors, types.LBMap) {
 			dp := fakeTypes.NewDatapathWithNodeAddressing(na)
 			nodeManager.Subscribe(dp.Node())
-			return dp, dp, dp.NodeIDs(), dp.Node(), dp.NodeNeighbors(), dp.LBMap()
+			return dp, dp.NodeIDs(), dp.Node(), dp.NodeNeighbors(), dp.LBMap()
 		},
 		func() signalmap.Map { return fakesignalmap.NewFakeSignalMap([][]byte{}, time.Second) },
 		func() authmap.Map { return fakeauthmap.NewFakeAuthMap() },

Diff for: pkg/datapath/fake/types/datapath.go

@@ -15,8 +15,6 @@ import (
 	"github.com/cilium/cilium/pkg/testutils/mockmaps"
 )
 
-var _ datapath.Datapath = (*FakeDatapath)(nil)
-
 type FakeDatapath struct {
 	node           *FakeNodeHandler
 	nodeAddressing datapath.NodeAddressing

Diff for: pkg/datapath/linux/datapath.go

@@ -3,10 +3,6 @@
 
 package linux
 
-import (
-	datapath "github.com/cilium/cilium/pkg/datapath/types"
-)
-
 // DatapathConfiguration is the static configuration of the datapath. The
 // configuration cannot change throughout the lifetime of a datapath object.
 type DatapathConfiguration struct {
@@ -16,18 +12,3 @@ type DatapathConfiguration struct {
 	// TunnelDevice is the name of the tunnel device (if any).
 	TunnelDevice string
 }
-
-type linuxDatapath struct{}
-
-type DatapathParams struct{}
-
-// NewDatapath creates a new Linux datapath
-func NewDatapath(p DatapathParams) datapath.Datapath {
-	dp := &linuxDatapath{}
-
-	return dp
-}
-
-func (l *linuxDatapath) Name() string {
-	return "linux-datapath"
-}

Diff for: pkg/datapath/linux/datapath_test.go

@@ -39,7 +39,6 @@ import (
 type EndpointSuite struct {
 	orchestrator datapath.Orchestrator
 	repo         *policy.Repository
-	datapath     datapath.Datapath
 	mgr          *cache.CachingIdentityAllocator
 
 	// Owners interface mock
@@ -108,10 +107,6 @@ func (s *EndpointSuite) SendNotification(msg monitorAPI.AgentNotifyMessage) erro
 	return nil
 }
 
-func (s *EndpointSuite) Datapath() datapath.Datapath {
-	return s.datapath
-}
-
 func (s *EndpointSuite) GetDNSRules(epID uint16) restore.DNSRules {
 	return nil
 }
@@ -692,14 +687,6 @@ func TestEndpointEventQueueDeadlockUponStop(t *testing.T) {
 		option.Config.EndpointQueueSize = oldQueueSize
 	}()
 
-	oldDatapath := s.datapath
-
-	s.datapath = fakeTypes.NewDatapath()
-
-	defer func() {
-		s.datapath = oldDatapath
-	}()
-
 	ep := NewTestEndpointWithState(t, s, s, testipcache.NewMockIPCache(), &FakeEndpointProxy{}, testidentity.NewMockIdentityAllocator(nil), 12345, StateReady)
 
 	ep.properties[PropertyFakeEndpoint] = true

Diff for: pkg/datapath/types/datapath.go

@@ -156,11 +156,6 @@ func (d *DummyOwner) SendNotification(msg monitorAPI.AgentNotifyMessage) error {
 	return nil
 }
 
-// Datapath returns a nil datapath.
-func (d *DummyOwner) Datapath() datapath.Datapath {
-	return nil
-}
-
 // Datapath returns a nil datapath.
 func (d *DummyOwner) Loader() datapath.Loader {
 	return nil

Diff for: pkg/endpoint/endpoint_test.go

@@ -24,9 +24,6 @@ type Owner interface {
 	// SendNotification is called to emit an agent notification
 	SendNotification(msg monitorAPI.AgentNotifyMessage) error
 
-	// Datapath returns a reference to the datapath implementation.
-	Datapath() datapath.Datapath
-
 	// Loader returns a reference to the loader implementation.
 	Loader() datapath.Loader
 

Diff for: pkg/endpoint/redirect_test.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	fake "github.com/cilium/cilium/pkg/datapath/fake/types"
 	"github.com/cilium/cilium/pkg/identity"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/mac"
@@ -78,12 +77,6 @@ func (s *EndpointSuite) endpointCreator(id uint16, secID identity.NumericIdentit
 
 func TestReadEPsFromDirNames(t *testing.T) {
 	s := setupEndpointSuite(t)
-	oldDatapath := s.datapath
-	defer func() {
-		s.datapath = oldDatapath
-	}()
-
-	s.datapath = fake.NewDatapath()
 	epsWanted, _ := s.createEndpoints()
 	tmpDir, err := os.MkdirTemp("", "cilium-tests")
 	defer func() {
@@ -156,13 +149,6 @@ func TestReadEPsFromDirNames(t *testing.T) {
 func TestReadEPsFromDirNamesWithRestoreFailure(t *testing.T) {
 	s := setupEndpointSuite(t)
 
-	oldDatapath := s.datapath
-	defer func() {
-		s.datapath = oldDatapath
-	}()
-
-	s.datapath = fake.NewDatapath()
-
 	eps, _ := s.createEndpoints()
 	ep := eps[0]
 	require.NotNil(t, ep)
@@ -225,12 +211,6 @@ func BenchmarkReadEPsFromDirNames(b *testing.B) {
 
 	// For this benchmark, the real linux datapath is necessary to properly
 	// serialize config files to disk and benchmark the restore.
-	oldDatapath := s.datapath
-	defer func() {
-		s.datapath = oldDatapath
-	}()
-
-	s.datapath = fake.NewDatapath()
 
 	epsWanted, _ := s.createEndpoints()
 	tmpDir, err := os.MkdirTemp("", "cilium-tests")

Diff for: pkg/endpoint/regeneration/owner.go

@@ -84,10 +84,6 @@ func (s *EndpointManagerSuite) SendNotification(msg monitorAPI.AgentNotifyMessag
 	return nil
 }
 
-func (s *EndpointManagerSuite) Datapath() datapath.Datapath {
-	return nil
-}
-
 func (s *EndpointManagerSuite) Loader() datapath.Loader {
 	return nil
 }

Diff for: pkg/endpoint/restore_test.go

@@ -181,10 +181,6 @@ func (s *DNSProxyTestSuite) SendNotification(msg monitorAPI.AgentNotifyMessage)
 	return nil
 }
 
-func (s *DNSProxyTestSuite) Datapath() datapath.Datapath {
-	return nil
-}
-
 func (s *DNSProxyTestSuite) Loader() datapath.Loader {
 	return nil
 }