Remove Cilium state service cache

Tetragon doesn't use the service cache anymore.

Signed-off-by: Michi Mutsuzaki <[email protected]>

pkg/cilium/monitor.go

@@ -67,8 +67,6 @@ func consumeMonitorEvents(ctx context.Context, conn net.Conn, ciliumState *ciliu
 	dnsAdd := ciliumState.GetLogRecordNotifyChannel()
 	ipCacheEvents := make(chan monitorAPI.AgentNotify, 100)
 	ciliumState.StartMirroringIPCache(ipCacheEvents)
-	serviceEvents := make(chan monitorAPI.AgentNotify, 100)
-	ciliumState.StartMirroringServiceCache(serviceEvents)
 	for {
 		if err := pl.DecodeBinary(dec); err != nil {
 			return err
@@ -90,9 +88,6 @@ func consumeMonitorEvents(ctx context.Context, conn net.Conn, ciliumState *ciliu
 			case monitorAPI.AgentNotifyIPCacheUpserted,
 				monitorAPI.AgentNotifyIPCacheDeleted:
 				ipCacheEvents <- an
-			case monitorAPI.AgentNotifyServiceUpserted,
-				monitorAPI.AgentNotifyServiceDeleted:
-				serviceEvents <- an
 			}
 		case monitorAPI.MessageTypeAccessLog:
 			// TODO re-think the way this is being done. We are dissecting/

pkg/cilium/state.go

@@ -14,7 +14,6 @@ import (
 	"github.com/cilium/tetragon/pkg/oldhubble/cilium/client"
 	"github.com/cilium/tetragon/pkg/oldhubble/fqdncache"
 	"github.com/cilium/tetragon/pkg/oldhubble/ipcache"
-	"github.com/cilium/tetragon/pkg/oldhubble/servicecache"
 )
 
 var (
@@ -43,7 +42,6 @@ func InitCiliumState(ctx context.Context, enableCiliumAPI bool) (*cilium.State,
 			v1.NewEndpoints(),
 			ipcache.New(),
 			fqdncache.New(),
-			servicecache.New(),
 			logger.GetLogger().WithField("subsystem", "cilium"))
 		go ciliumState.Start()
 		go HandleMonitorSocket(ctx, ciliumState)
@@ -57,7 +55,6 @@ func GetFakeCiliumState() *cilium.State {
 		v1.NewEndpoints(),
 		ipcache.New(),
 		fqdncache.New(),
-		servicecache.New(),
 		logger.GetLogger().WithField("subsystem", "cilium"))
 }
 

pkg/oldhubble/cilium/client/client.go

@@ -20,7 +20,6 @@ type Client interface {
 	GetIdentity(id uint64) (*models.Identity, error)
 	GetFqdnCache() ([]*models.DNSLookup, error)
 	GetIPCache() ([]*models.IPListEntry, error)
-	GetServiceCache() ([]*models.Service, error)
 }
 
 // Cilium is an abstraction to communicate with the cilium-agent.
@@ -84,15 +83,6 @@ func (c *Cilium) GetIPCache() ([]*models.IPListEntry, error) {
 	return ips.Payload, nil
 }
 
-// GetServiceCache retrieves the contents of the Cilium service cache.
-func (c *Cilium) GetServiceCache() ([]*models.Service, error) {
-	svcs, err := c.Client.Service.GetService(nil)
-	if err != nil {
-		return nil, err
-	}
-	return svcs.Payload, nil
-}
-
 // IsIPCacheNotFoundErr is true if the IPCache fetch error was a 404
 func IsIPCacheNotFoundErr(err error) bool {
 	_, ok := err.(*ciliumPolicy.GetIPNotFound)

pkg/oldhubble/cilium/state.go

@@ -9,7 +9,6 @@ import (
 	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/cilium/tetragon/pkg/oldhubble/cilium/client"
 	"github.com/cilium/tetragon/pkg/oldhubble/ipcache"
-	"github.com/cilium/tetragon/pkg/oldhubble/servicecache"
 	"github.com/sirupsen/logrus"
 )
 
@@ -30,9 +29,6 @@ type State struct {
 	// ipcache is a mirror of Cilium's IPCache
 	ipcache *ipcache.IPCache
 
-	// serviceCache is a cache that contains information about services.
-	serviceCache *servicecache.ServiceCache
-
 	// logRecord is a channel used to exchange L7 DNS requests seens from the
 	// monitor
 	logRecord chan monitor.LogRecordNotify
@@ -48,14 +44,13 @@ func NewCiliumState(
 	endpoints v1.EndpointsHandler,
 	ipCache *ipcache.IPCache,
 	fqdnCache FqdnCache,
-	serviceCache *servicecache.ServiceCache,
 	logger *logrus.Entry,
 ) *State {
 	return &State{
-		ciliumClient: ciliumClient,
-		endpoints:    endpoints,
-		ipcache:      ipCache,
-		fqdnCache:    fqdnCache, serviceCache: serviceCache,
+		ciliumClient:   ciliumClient,
+		endpoints:      endpoints,
+		ipcache:        ipCache,
+		fqdnCache:      fqdnCache,
 		logRecord:      make(chan monitor.LogRecordNotify, 100),
 		endpointEvents: make(chan monitorAPI.AgentNotify, 100),
 		log:            logger,
@@ -82,17 +77,6 @@ func (s *State) StartMirroringIPCache(ipCacheEvents <-chan monitorAPI.AgentNotif
 	go s.syncIPCache(ipCacheEvents)
 }
 
-// StartMirroringServiceCache initially caches service information from Cilium
-// and then starts to mirror service information based on events that are sent
-// to the serviceEvents channel. Only messages of type
-// `AgentNotifyServiceUpserted` and `AgentNotifyServiceDeleted` should be sent
-// to this channel.  This function assumes that the caller is already connected
-// to Cilium Monitor, i.e. no Service notification must be lost after calling
-// this method.
-func (s *State) StartMirroringServiceCache(serviceEvents <-chan monitorAPI.AgentNotify) {
-	go s.syncServiceCache(serviceEvents)
-}
-
 // GetLogRecordNotifyChannel returns the event channel to receive
 // monitorAPI.LogRecordNotify events.
 func (s *State) GetLogRecordNotifyChannel() chan<- monitor.LogRecordNotify {
@@ -125,8 +109,3 @@ func (s *State) GetFQDNCache() FqdnCache {
 func (s *State) GetIPCache() *ipcache.IPCache {
 	return s.ipcache
 }
-
-// GetServiceCache returns serviceCache.
-func (s *State) GetServiceCache() *servicecache.ServiceCache {
-	return s.serviceCache
-}

pkg/oldhubble/parser/getters/getters.go

@@ -6,7 +6,6 @@ package getters
 import (
 	"net"
 
-	pb "github.com/cilium/cilium/api/v1/flow"
 	v1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	"github.com/cilium/tetragon/pkg/oldhubble/ipcache"
 
@@ -37,8 +36,3 @@ type IPGetter interface {
 	// GetIPIdentity fetches information known about a remote IP.
 	GetIPIdentity(ip net.IP) (identity ipcache.IPIdentity, ok bool)
 }
-
-// ServiceGetter fetches service metadata.
-type ServiceGetter interface {
-	GetServiceByAddr(ip net.IP, port uint16) (service pb.Service, ok bool)
-}