remove extra informers that are not needed

Author: leandroberetta

pkg/pipeline/transform/kubernetes/informers/informers-mock.go

@@ -136,16 +136,6 @@ func (m *IndexerMock) MockReplicaSet(name, namespace, ownerName, ownerKind strin
 }
 
 func (m *IndexerMock) MockDeployment(name, namespace, ownerName, ownerKind string) {
-	m.On("GetByKey", namespace+"/"+name).Return(&metav1.ObjectMeta{
-		Name: name,
-		OwnerReferences: []metav1.OwnerReference{{
-			Kind: ownerKind,
-			Name: ownerName,
-		}},
-	}, true, nil)
-}
-
-func (m *IndexerMock) MockGateway(name, namespace, ownerName, ownerKind string) {
 	if ownerName == "" {
 		// No owner
 		m.On("GetByKey", namespace+"/"+name).Return(&metav1.ObjectMeta{
@@ -191,23 +181,21 @@ func SetupIndexerMocks(kd *Informers) (pods, nodes, svc, rs *IndexerMock) {
 	return
 }
 
-func SetupIndexerMocksWithTrackedKinds(kd *Informers, trackedKinds []string) (pods, nodes, svc, rs, deploy, gw *IndexerMock) {
+func SetupIndexerMocksWithTrackedKinds(kd *Informers, trackedKinds []string) (pods, nodes, svc, rs, deploy *IndexerMock) {
 	// Setup base informers
 	pods, nodes, svc, rs = SetupIndexerMocks(kd)
 
 	// Setup additional informers based on trackedKinds
 	for _, kind := range trackedKinds {
 		switch kind {
-		case "Deployment":
-			deploy = &IndexerMock{}
-			dim := InformerMock{}
-			dim.On("GetIndexer").Return(deploy)
-			kd.deployments = &dim
-		case "Gateway":
-			gw = &IndexerMock{}
-			gim := InformerMock{}
-			gim.On("GetIndexer").Return(gw)
-			kd.gateways = &gim
+		case "Deployment", "Gateway":
+			// Gateway requires Deployment informer, so we initialize it for both
+			if deploy == nil {
+				deploy = &IndexerMock{}
+				dim := InformerMock{}
+				dim.On("GetIndexer").Return(deploy)
+				kd.deployments = &dim
+			}
 		}
 	}
 	return

pkg/pipeline/transform/kubernetes/informers/informers.go

@@ -68,7 +68,6 @@ type Informers struct {
 	replicaSets cache.SharedIndexInformer
 	// New informers for ownership tracking
 	deployments cache.SharedIndexInformer
-	gateways    cache.SharedIndexInformer
 	// Config and channels
 	config           Config
 	stopChan         chan struct{}
@@ -267,8 +266,6 @@ func (k *Informers) getOwnerFromInformer(kind, namespace, name string) *OwnerInf
 		informer = k.replicaSets
 	case "Deployment":
 		informer = k.deployments
-	case "Gateway":
-		informer = k.gateways
 	default:
 		return nil
 	}
@@ -507,29 +504,6 @@ func (k *Informers) initDeploymentInformer(informerFactory metadatainformer.Shar
 	return nil
 }
 
-func (k *Informers) initGatewayInformer(informerFactory metadatainformer.SharedInformerFactory) error {
-	k.gateways = informerFactory.ForResource(
-		schema.GroupVersionResource{
-			Group:    "gateway.networking.k8s.io",
-			Version:  "v1",
-			Resource: "gateways",
-		}).Informer()
-	if err := k.gateways.SetTransform(func(i interface{}) (interface{}, error) {
-		gw, ok := i.(*metav1.PartialObjectMetadata)
-		if !ok {
-			return nil, fmt.Errorf("was expecting a Gateway. Got: %T", i)
-		}
-		return &metav1.ObjectMeta{
-			Name:            gw.Name,
-			Namespace:       gw.Namespace,
-			OwnerReferences: gw.OwnerReferences,
-		}, nil
-	}); err != nil {
-		return fmt.Errorf("can't set Gateways transform: %w", err)
-	}
-	return nil
-}
-
 func (k *Informers) InitFromConfig(kubeconfig string, infConfig *Config, opMetrics *operational.Metrics) error {
 	// Initialization variables
 	k.config = *infConfig
@@ -588,16 +562,12 @@ func (k *Informers) initInformers(client kubernetes.Interface, metaClient metada
 	// Initialize additional informers based on trackedKinds configuration
 	for _, kind := range cfg.trackedKinds {
 		switch kind {
-		case "Deployment":
+		case "Deployment", "Gateway":
+			// Gateway requires Deployment informer to navigate ownership chain
 			log.Debugf("initializing Deployment informer (trackedKinds)")
 			if err := k.initDeploymentInformer(metadataInformerFactory); err != nil {
 				return err
 			}
-		case "Gateway":
-			log.Debugf("initializing Gateway informer (trackedKinds)")
-			if err := k.initGatewayInformer(metadataInformerFactory); err != nil {
-				return err
-			}
 		}
 	}
 

pkg/pipeline/transform/kubernetes/informers/informers_test.go

@@ -132,13 +132,12 @@ func TestOwnershipTracking_GatewayAPI(t *testing.T) {
 		},
 	}
 
-	pidx, hidx, sidx, ridx, didx, gwidx := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment", "Gateway"})
+	pidx, hidx, sidx, ridx, didx := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment", "Gateway"})
 
 	// Setup mocks for the ownership chain
 	ridx.MockReplicaSet("rs1", "test-ns", "deploy1", "Deployment")
 	ridx.FallbackNotFound()
 	didx.MockDeployment("deploy1", "test-ns", "gateway1", "Gateway")
-	gwidx.MockGateway("gateway1", "test-ns", "", "") // Gateway has no owner
 
 	pidx.MockPod("1.2.3.4", "", "", "pod1", "test-ns", "10.0.0.1", "rs1", "ReplicaSet")
 	pidx.FallbackNotFound()
@@ -159,11 +158,11 @@ func TestOwnershipTracking_OnlyDeployment(t *testing.T) {
 	kubeData := Informers{
 		indexerHitMetric: metrics.CreateIndexerHitCounter(),
 		config: Config{
-			trackedKinds: []string{"ReplicaSet", "Deployment"}, // Gateway NOT tracked
+			trackedKinds: []string{"Deployment"}, // Gateway NOT tracked
 		},
 	}
 
-	pidx, hidx, sidx, ridx, didx, _ := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment"})
+	pidx, hidx, sidx, ridx, didx := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment"})
 
 	ridx.MockReplicaSet("rs1", "test-ns", "deploy1", "Deployment")
 	ridx.FallbackNotFound()
@@ -216,17 +215,16 @@ func TestOwnershipTracking_MaxDepth(t *testing.T) {
 	kubeData := Informers{
 		indexerHitMetric: metrics.CreateIndexerHitCounter(),
 		config: Config{
-			trackedKinds: []string{"ReplicaSet", "Deployment", "Gateway"},
+			trackedKinds: []string{"Deployment", "Gateway"},
 		},
 	}
 
-	pidx, hidx, sidx, ridx, didx, gwidx := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment", "Gateway"})
+	pidx, hidx, sidx, ridx, didx := SetupIndexerMocksWithTrackedKinds(&kubeData, []string{"Deployment", "Gateway"})
 
 	ridx.MockReplicaSet("rs1", "test-ns", "deploy1", "Deployment")
 	ridx.FallbackNotFound()
+	// Deployment owned by Gateway (which we can't traverse further without Gateway informer)
 	didx.MockDeployment("deploy1", "test-ns", "gateway1", "Gateway")
-	// Gateway has another owner (hypothetical 4th level) - should be ignored
-	gwidx.MockGateway("gateway1", "test-ns", "someother", "SomeKind")
 
 	pidx.MockPod("1.2.3.4", "", "", "pod1", "test-ns", "10.0.0.1", "rs1", "ReplicaSet")
 	pidx.FallbackNotFound()