resolve comment

Author: dspo

internal/controller/ingress_controller.go

@@ -356,7 +356,31 @@ func (r *IngressReconciler) listIngressesBySecret(ctx context.Context, obj clien
 			})
 		}
 	}
-	return requests
+
+	gatewayProxyList := &v1alpha1.GatewayProxyList{}
+	if err := r.List(ctx, gatewayProxyList, client.MatchingFields{
+		indexer.SecretIndexRef: indexer.GenIndexKey(secret.GetNamespace(), secret.GetName()),
+	}); err != nil {
+		r.Log.Error(err, "failed to list gateway proxies by secret", "secret", secret.GetName())
+		return nil
+	}
+
+	for _, gatewayProxy := range gatewayProxyList.Items {
+		var (
+			ingressClassList networkingv1.IngressClassList
+			indexKey         = indexer.GenIndexKey(gatewayProxy.GetNamespace(), gatewayProxy.GetName())
+			matchingFields   = client.MatchingFields{indexer.IngressClassParametersRef: indexKey}
+		)
+		if err := r.List(ctx, &ingressClassList, matchingFields); err != nil {
+			r.Log.Error(err, "failed to list ingress classes for gateway proxy", "gatewayproxy", indexKey)
+			continue
+		}
+		for _, ingressClass := range ingressClassList.Items {
+			requests = append(requests, r.listIngressForIngressClass(ctx, &ingressClass)...)
+		}
+	}
+
+	return distinctRequests(requests)
 }
 
 func (r *IngressReconciler) listIngressForBackendTrafficPolicy(ctx context.Context, obj client.Object) (requests []reconcile.Request) {

internal/controller/ingressclass_controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/api7/gopkg/pkg/log"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
@@ -17,6 +16,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	"github.com/api7/gopkg/pkg/log"
+
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
 	"github.com/api7/api7-ingress-controller/internal/provider"
@@ -154,29 +155,10 @@ func (r *IngressClassReconciler) listIngressClassesForSecret(ctx context.Context
 	// 2. list ingress classes by gateway proxies
 	requests := make([]reconcile.Request, 0)
 	for _, gatewayProxy := range gatewayProxyList.Items {
-		ingressClassList := &networkingv1.IngressClassList{}
-		if err := r.List(ctx, ingressClassList, client.MatchingFields{
-			indexer.IngressClassParametersRef: indexer.GenIndexKey(gatewayProxy.GetNamespace(), gatewayProxy.GetName()),
-		}); err != nil {
-			r.Log.Error(err, "failed to list ingress classes by secret", "secret", secret.GetName())
-			return nil
-		}
-		for _, ingressClass := range ingressClassList.Items {
-			if !r.matchesController(&ingressClass) {
-				continue
-			}
-			requests = append(requests, reconcile.Request{
-				NamespacedName: client.ObjectKey{
-					Name:      ingressClass.GetName(),
-					Namespace: ingressClass.GetNamespace(),
-				},
-			})
-		}
+		requests = append(requests, r.listIngressClassesForGatewayProxy(ctx, &gatewayProxy)...)
 	}
 
-	requests = distinctRequests(requests)
-
-	return requests
+	return distinctRequests(requests)
 }
 
 func (r *IngressClassReconciler) processInfrastructure(tctx *provider.TranslateContext, ingressClass *networkingv1.IngressClass) error {

test/e2e/ingress/ingress.go

@@ -867,28 +867,10 @@ spec:
             name: httpbin-service-e2e-test
             port:
               number: 80
-`
-		const ingressSpec2 = `
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: api7-ingress
-spec:
-  ingressClassName: api7-ingress-class
-  rules:
-  - host: ingress.example.com
-    http:
-      paths:
-      - path: /put
-        pathType: Prefix
-        backend:
-          service:
-            name: httpbin-service-e2e-test
-            port:
-              number: 80
 `
 		var (
-			err error
+			additionalGatewayGroupID string
+			err                      error
 		)
 
 		It("GatewayProxy reference Secret", func() {
@@ -917,35 +899,31 @@ spec:
 			}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).
 				Should(Equal(http.StatusOK))
 
-			// update gateway group admin-key
-			adminKey := s.GetAdminKey(s.CurrentGatewayGroupID())
+			By("create additional gateway group to get new admin key")
+			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
+
+			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
 
-			// should fail to request provider service and get 401 because the admin-key is changed
-			By("create Ingress")
-			err = s.CreateResourceFromStringWithNamespace(ingressSpec2, s.Namespace())
-			s.WaitControllerManagerLog("Request failed with status code 401", 0, 10*time.Second)
+			By("Ingress not found for additional gateway group")
+			client.
+				GET("/get").
+				WithHost("ingress.example.com").
+				Expect().
+				Status(http.StatusNotFound)
 
-			// the new Ingress should not work consistently
-			Consistently(func() int {
-				return s.NewAPISIXClient().
-					GET("/put").
-					WithHost("ingress.example.com").
-					Expect().Raw().StatusCode
-			}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).
-				Should(Equal(http.StatusNotFound))
+			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
 			By("update secret")
-			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(secretSpec, base64.StdEncoding.EncodeToString([]byte(adminKey))), s.Namespace())
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(secretSpec, base64.StdEncoding.EncodeToString([]byte(resources.AdminAPIKey))), s.Namespace())
 			Expect(err).NotTo(HaveOccurred(), "creating secret")
 
-			By("create Ingress again")
-			err = s.CreateResourceFromStringWithNamespace(ingressSpec2, s.Namespace())
-			Expect(err).NotTo(HaveOccurred(), "creating Ingress with path prefix /put")
-
-			By("verify Ingress works")
+			By("verify Ingress works for additional gateway group")
 			Eventually(func() int {
-				return s.NewAPISIXClient().
-					PUT("/put").
+				return client.
+					GET("/get").
 					WithHost("ingress.example.com").
 					Expect().Raw().StatusCode
 			}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).