diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go index 4288785de..a800ec0da 100644 --- a/internal/ingress/controller/store/store.go +++ b/internal/ingress/controller/store/store.go @@ -141,7 +141,6 @@ type Informer struct { // Lister contains object listers (stores). type Lister struct { - Ingress IngressLister IngressClass IngressClassLister Service ServiceLister EndpointSlice EndpointSliceLister @@ -330,7 +329,6 @@ func New( ) store.informers.Ingress = infFactory.Networking().V1().Ingresses().Informer() - store.listers.Ingress.Store = store.informers.Ingress.GetStore() if !icConfig.IgnoreIngressClass { store.informers.IngressClass = infFactory.Networking().V1().IngressClasses().Informer() diff --git a/internal/ingress/controller/store/store_test.go b/internal/ingress/controller/store/store_test.go index 317c0f36c..9608940b8 100644 --- a/internal/ingress/controller/store/store_test.go +++ b/internal/ingress/controller/store/store_test.go @@ -1389,7 +1389,6 @@ func newStore() *k8sStore { listers: &Lister{ // add more listers if needed IngressClass: IngressClassLister{cache.NewStore(cache.MetaNamespaceKeyFunc)}, - Ingress: IngressLister{cache.NewStore(cache.MetaNamespaceKeyFunc)}, IngressWithAnnotation: IngressWithAnnotationsLister{cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc)}, }, sslStore: NewSSLCertTracker(), @@ -1409,18 +1408,12 @@ func TestUpdateSecretIngressMap(t *testing.T) { Namespace: "testns", }, } - if err := s.listers.Ingress.Add(ingTpl); err != nil { - t.Errorf("error adding the Ingress template: %v", err) - } t.Run("with TLS secret", func(t *testing.T) { ing := ingTpl.DeepCopy() ing.Spec = networking.IngressSpec{ TLS: []networking.IngressTLS{{SecretName: "tls"}}, } - if err := s.listers.Ingress.Update(ing); err != nil { - t.Errorf("error updating the Ingress: %v", err) - } s.updateSecretIngressMap(ing) if l := s.secretIngressMap.Len(); !(l == 1 && s.secretIngressMap.Has("testns/tls")) { @@ -1433,9 +1426,6 @@ func TestUpdateSecretIngressMap(t *testing.T) { ing.ObjectMeta.SetAnnotations(map[string]string{ parser.GetAnnotationWithPrefix("auth-secret"): "auth", }) - if err := s.listers.Ingress.Update(ing); err != nil { - t.Errorf("error updating the Ingress: %v", err) - } s.updateSecretIngressMap(ing) if l := s.secretIngressMap.Len(); !(l == 1 && s.secretIngressMap.Has("testns/auth")) { @@ -1448,9 +1438,6 @@ func TestUpdateSecretIngressMap(t *testing.T) { ing.ObjectMeta.SetAnnotations(map[string]string{ parser.GetAnnotationWithPrefix("auth-secret"): "testns/auth", }) - if err := s.listers.Ingress.Update(ing); err != nil { - t.Errorf("error updating the Ingress: %v", err) - } s.updateSecretIngressMap(ing) if l := s.secretIngressMap.Len(); !(l == 1 && s.secretIngressMap.Has("testns/auth")) { @@ -1463,9 +1450,6 @@ func TestUpdateSecretIngressMap(t *testing.T) { ing.ObjectMeta.SetAnnotations(map[string]string{ parser.GetAnnotationWithPrefix("auth-secret"): "anotherns/auth", }) - if err := s.listers.Ingress.Update(ing); err != nil { - t.Errorf("error updating the Ingress: %v", err) - } s.updateSecretIngressMap(ing) if l := s.secretIngressMap.Len(); l != 0 { @@ -1478,9 +1462,6 @@ func TestUpdateSecretIngressMap(t *testing.T) { ing.ObjectMeta.SetAnnotations(map[string]string{ parser.GetAnnotationWithPrefix("auth-secret"): "ns/name/garbage", }) - if err := s.listers.Ingress.Update(ing); err != nil { - t.Errorf("error updating the Ingress: %v", err) - } s.updateSecretIngressMap(ing) if l := s.secretIngressMap.Len(); l != 0 {