fix: status should not be recorded when ingressclass does not match (#2519)

AlinsRan · ronething · commit 098fe10eced2 · 2025-09-10T21:52:35.000+08:00
Signed-off-by: Ashing Zheng &lt;axingfly@gmail.com&gt;
diff --git a/internal/controller/apisixglobalrule_controller.go b/internal/controller/apisixglobalrule_controller.go
@@ -98,7 +98,7 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	// process IngressClass parameters if they reference GatewayProxy
 	if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, &globalRule, ingressClass); err != nil {
 		r.Log.Error(err, "failed to process IngressClass parameters", "ingressClass", ingressClass.Name)
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	// Sync the global rule to APISIX
diff --git a/internal/controller/apisixpluginconfig_controller.go b/internal/controller/apisixpluginconfig_controller.go
@@ -68,6 +68,16 @@ func (r *ApisixPluginConfigReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, nil
 	}
 
+	tctx := provider.NewDefaultTranslateContext(ctx)
+
+	_, err := GetIngressClass(tctx, r.Client, r.Log, pc.Spec.IngressClassName)
+	if err != nil {
+		r.Log.V(1).Info("no matching IngressClass available",
+			"ingressClassName", pc.Spec.IngressClassName,
+			"error", err.Error())
+		return ctrl.Result{}, nil
+	}
+
 	// Only update status
 	r.updateStatus(&pc, nil)
 	return ctrl.Result{}, nil
diff --git a/internal/controller/apisixtls_controller.go b/internal/controller/apisixtls_controller.go
@@ -145,7 +145,7 @@ func (r *ApisixTlsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 			Reason:             string(apiv2.ConditionReasonInvalidSpec),
 			Message:            err.Error(),
 		})
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	// process ApisixTls validation
@@ -159,7 +159,7 @@ func (r *ApisixTlsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 			Reason:             string(apiv2.ConditionReasonInvalidSpec),
 			Message:            err.Error(),
 		})
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	if err := r.Provider.Update(ctx, tctx, &tls); err != nil {
diff --git a/internal/controller/consumer_controller.go b/internal/controller/consumer_controller.go
@@ -19,6 +19,7 @@ package controller
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -36,6 +37,7 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
+	"github.com/apache/apisix-ingress-controller/internal/controller/config"
 	"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
 	"github.com/apache/apisix-ingress-controller/internal/controller/status"
 	"github.com/apache/apisix-ingress-controller/internal/manager/readiness"
@@ -208,8 +210,10 @@ func (r *ConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 	gateway, err := r.getGateway(ctx, consumer)
 	if err != nil {
-		r.Log.Error(err, "failed to get gateway", "consumer", consumer)
-		statusErr = err
+		r.Log.V(1).Info("no matching Gateway available",
+			"gatewayRef", consumer.Spec.GatewayRef,
+			"error", err.Error())
+		return ctrl.Result{}, nil
 	}
 
 	rk := utils.NamespacedNameKind(consumer)
@@ -295,8 +299,17 @@ func (r *ConsumerReconciler) getGateway(ctx context.Context, consumer *v1alpha1.
 		Name:      consumer.Spec.GatewayRef.Name,
 		Namespace: ns,
 	}, gateway); err != nil {
-		r.Log.Error(err, "failed to get gateway", "gateway", consumer.Spec.GatewayRef.Name)
-		return nil, err
+		return nil, fmt.Errorf("failed to get gateway %s/%s: %w", ns, consumer.Spec.GatewayRef.Name, err)
+	}
+	gatewayClass := gatewayv1.GatewayClass{}
+	if err := r.Get(ctx, client.ObjectKey{
+		Name: string(gateway.Spec.GatewayClassName),
+	}, &gatewayClass); err != nil {
+		return nil, fmt.Errorf("failed to retrieve gatewayclass for gateway: %w", err)
+	}
+
+	if string(gatewayClass.Spec.ControllerName) != config.ControllerConfig.ControllerName {
+		return nil, fmt.Errorf("gateway %s/%s is not managed by this controller", gateway.Namespace, gateway.Name)
 	}
 	return gateway, nil
 }
diff --git a/internal/controller/ingressclass_controller.go b/internal/controller/ingressclass_controller.go
@@ -98,7 +98,7 @@ func (r *IngressClassReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, ingressClass, ingressClass); err != nil {
 		r.Log.Error(err, "failed to process infrastructure for ingressclass", "ingressclass", ingressClass.GetName())
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	if err := r.Provider.Update(ctx, tctx, ingressClass); err != nil {
diff --git a/test/conformance/apisix/suite_test.go b/test/conformance/apisix/suite_test.go
@@ -125,9 +125,7 @@ func TestMain(m *testing.M) {
 	f := framework.NewFramework()
 
 	// init newDeployer function
-	scaffold.NewDeployer = func(s *scaffold.Scaffold) scaffold.Deployer {
-		return scaffold.NewAPISIXDeployer(s)
-	}
+	scaffold.NewDeployer = scaffold.NewAPISIXDeployer
 
 	// Check and delete specific namespaces if they exist
 	kubectl := k8s.NewKubectlOptions("", "", "default")
@@ -140,13 +138,16 @@ func TestMain(m *testing.M) {
 	k8s.CreateNamespace(GinkgoT(), kubectl, namespace)
 	defer k8s.DeleteNamespace(GinkgoT(), kubectl, namespace)
 
-	s := scaffold.NewScaffold(&scaffold.Options{
-		ControllerName:    "apisix.apache.org/apisix-ingress-controller",
+	adminkey := getEnvOrDefault("APISIX_ADMIN_KEY", "edd1c9f034335f136f87ad84b625c8f1")
+	controllerName := "apisix.apache.org/apisix-ingress-controller"
+	s := scaffold.NewScaffold(scaffold.Options{
+		ControllerName:    controllerName,
 		SkipHooks:         true,
-		APISIXAdminAPIKey: getEnvOrDefault("APISIX_ADMIN_KEY", "edd1c9f034335f136f87ad84b625c8f1"),
+		APISIXAdminAPIKey: adminkey,
 	})
 
 	s.Deployer.DeployDataplane(scaffold.DeployDataplaneOptions{
+		AdminKey:          adminkey,
 		Namespace:         namespace,
 		SkipCreateTunnels: true,
 		ServiceType:       "LoadBalancer",
@@ -162,7 +163,7 @@ func TestMain(m *testing.M) {
 	address := svc.Status.LoadBalancer.Ingress[0].IP
 
 	f.DeployIngress(framework.IngressDeployOpts{
-		ControllerName:     s.GetControllerName(),
+		ControllerName:     controllerName,
 		Namespace:          namespace,
 		StatusAddress:      address,
 		InitSyncDelay:      20 * time.Minute,
@@ -174,7 +175,7 @@ func TestMain(m *testing.M) {
 
 	defaultGatewayProxyOpts = GatewayProxyOpts{
 		StatusAddress: address,
-		AdminKey:      s.AdminKey(),
+		AdminKey:      adminkey,
 		AdminEndpoint: adminEndpoint,
 	}
 
diff --git a/test/e2e/crds/v1alpha1/backendtrafficpolicy.go b/test/e2e/crds/v1alpha1/backendtrafficpolicy.go
@@ -118,7 +118,8 @@ spec:
 			By("create GatewayProxy")
 			gatewayProxyName := gatewayName
 			// TODO: change to gateway proxy spec
-			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, gatewayProxyName, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			err = s.CreateResourceFromString(s.GetGatewayProxySpec())
+			s.GetGatewayProxySpec()
 			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 			time.Sleep(time.Second)
 
diff --git a/test/e2e/crds/v2/consumer.go b/test/e2e/crds/v2/consumer.go
@@ -41,7 +41,7 @@ var _ = Describe("Test ApisixConsumer", Label("apisix.apache.org", "v2", "apisix
 
 	BeforeEach(func() {
 		By("create GatewayProxy")
-		gatewayProxy := s.GetGatewayProxyYaml()
+		gatewayProxy := s.GetGatewayProxySpec()
 		err := s.CreateResourceFromString(gatewayProxy)
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 		time.Sleep(5 * time.Second)
diff --git a/test/e2e/crds/v2/globalrule.go b/test/e2e/crds/v2/globalrule.go
@@ -55,7 +55,7 @@ spec:
 	Context("ApisixGlobalRule Basic Operations", func() {
 		BeforeEach(func() {
 			By("create GatewayProxy")
-			gatewayProxy := s.GetGatewayProxyYaml()
+			gatewayProxy := s.GetGatewayProxySpec()
 			err := s.CreateResourceFromString(gatewayProxy)
 			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 			time.Sleep(5 * time.Second)
diff --git a/test/e2e/crds/v2/pluginconfig.go b/test/e2e/crds/v2/pluginconfig.go
@@ -53,7 +53,7 @@ var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "ap
 	Context("Test ApisixPluginConfig", func() {
 		BeforeEach(func() {
 			By("create GatewayProxy")
-			gatewayProxy := s.GetGatewayProxyYaml()
+			gatewayProxy := s.GetGatewayProxySpec()
 			err := s.CreateResourceFromString(gatewayProxy)
 			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 			time.Sleep(5 * time.Second)
diff --git a/test/e2e/crds/v2/route.go b/test/e2e/crds/v2/route.go
@@ -62,7 +62,7 @@ spec:
 `
 	BeforeEach(func() {
 		By("create GatewayProxy")
-		gatewayProxy := s.GetGatewayProxyYaml()
+		gatewayProxy := s.GetGatewayProxySpec()
 		err := s.CreateResourceFromString(gatewayProxy)
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 		time.Sleep(5 * time.Second)
diff --git a/test/e2e/crds/v2/status.go b/test/e2e/crds/v2/status.go
@@ -36,7 +36,7 @@ import (
 
 var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org", "v2", "apisixroute"), func() {
 	var (
-		s = scaffold.NewScaffold(&scaffold.Options{
+		s = scaffold.NewScaffold(scaffold.Options{
 			// for triggering the sync
 			SyncPeriod: 3 * time.Second,
 		})
@@ -46,7 +46,7 @@ var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org",
 	Context("Test ApisixRoute Sync Status", func() {
 		BeforeEach(func() {
 			By("create GatewayProxy")
-			gatewayProxy := s.GetGatewayProxyYaml()
+			gatewayProxy := s.GetGatewayProxySpec()
 			err := s.CreateResourceFromString(gatewayProxy)
 			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 			time.Sleep(5 * time.Second)
@@ -349,7 +349,7 @@ spec:
 `
 		BeforeEach(func() {
 			By("create GatewayProxy")
-			gatewayProxy := s.GetGatewayProxyYaml()
+			gatewayProxy := s.GetGatewayProxySpec()
 			err := s.CreateResourceFromString(gatewayProxy)
 			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
 			time.Sleep(5 * time.Second)
diff --git a/test/e2e/framework/ingress.go b/test/e2e/framework/ingress.go
@@ -60,7 +60,6 @@ func (f *Framework) DeployIngress(opts IngressDeployOpts) {
 	f.GomegaT.Expect(err).ToNot(HaveOccurred(), "rendering ingress spec")
 
 	kubectlOpts := k8s.NewKubectlOptions("", "", opts.Namespace)
-
 	k8s.KubectlApplyFromString(f.GinkgoT, kubectlOpts, buf.String())
 
 	err = WaitPodsAvailable(f.GinkgoT, kubectlOpts, metav1.ListOptions{
diff --git a/test/e2e/gatewayapi/controller.go b/test/e2e/gatewayapi/controller.go
@@ -164,10 +164,13 @@ spec:
 		})
 		It("Apply resource ", func() {
 			ResourceApplied(s1, "HTTPRoute", "httpbin", s1.Namespace(), fmt.Sprintf(route1, s1.Namespace()), 1)
-			time.Sleep(5 * time.Second)
-			routes, err := s1.DefaultDataplaneResource().Route().List(s1.Context)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(routes).To(HaveLen(1))
+
+			s1.RetryAssertion(func() int {
+				routes, _ := s1.DefaultDataplaneResource().Route().List(s1.Context)
+				return len(routes)
+			}).WithInterval(3*time.Second).Should(Equal(1), "checking route count")
+
+			routes, _ := s1.DefaultDataplaneResource().Route().List(s1.Context)
 			assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], s1.GetControllerName())
 		})
 	})
diff --git a/test/e2e/gatewayapi/gatewayproxy.go b/test/e2e/gatewayapi/gatewayproxy.go
@@ -129,7 +129,7 @@ spec:
 
 	BeforeEach(func() {
 		By("Create GatewayClass")
-		gatewayClassName = fmt.Sprintf("apisix-%d", time.Now().Unix())
+		gatewayClassName = s.Namespace()
 		err := s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()), "")
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
 		time.Sleep(5 * time.Second)
diff --git a/test/e2e/gatewayapi/httproute.go b/test/e2e/gatewayapi/httproute.go
@@ -115,7 +115,7 @@ spec:
 		Expect(s.CreateResourceFromStringWithNamespace(getGatewayProxySpec(), s.Namespace())).
 			NotTo(HaveOccurred(), "creating GatewayProxy")
 
-		gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Nanosecond())
+		gatewayClassName := s.Namespace()
 		Expect(s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")).
 			NotTo(HaveOccurred(), "creating GatewayClass")
 
@@ -154,7 +154,7 @@ spec:
 		createSecret(s, secretName)
 
 		By("create GatewayClass")
-		gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Nanosecond())
+		gatewayClassName := s.Namespace()
 		Expect(s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")).
 			NotTo(HaveOccurred(), "creating GatewayClass")
 
@@ -319,7 +319,7 @@ spec:
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
 			By("Create additional GatewayClass")
-			additionalGatewayClassName = fmt.Sprintf("apisix-%d", time.Now().Unix())
+			additionalGatewayClassName = fmt.Sprintf("additional-gatewayclass-%d", time.Now().Nanosecond())
 			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, additionalGatewayClassName, s.GetControllerName()), "")
 			Expect(err).NotTo(HaveOccurred(), "creating additional GatewayClass")
 
diff --git a/test/e2e/gatewayapi/status.go b/test/e2e/gatewayapi/status.go
@@ -33,7 +33,7 @@ import (
 
 var _ = Describe("Test Gateway API Status", Label("networking.k8s.io", "httproute"), func() {
 	var (
-		s = scaffold.NewScaffold(&scaffold.Options{
+		s = scaffold.NewScaffold(scaffold.Options{
 			// for triggering the sync
 			SyncPeriod: 3 * time.Second,
 		})
diff --git a/test/e2e/scaffold/adc.go b/test/e2e/scaffold/adc.go
@@ -178,14 +178,16 @@ func (a *adcDataplaneResource) dumpResources(ctx context.Context) (*translator.T
 		routes = append(routes, service.Routes...)
 	}
 
-	return &translator.TranslateResult{
+	result := &translator.TranslateResult{
 		Routes:         routes,
 		Services:       resources.Services,
 		SSL:            resources.SSLs,
 		GlobalRules:    resources.GlobalRules,
 		PluginMetadata: resources.PluginMetadata,
 		Consumers:      resources.Consumers,
-	}, nil
+	}
+	log.Debugw("dumped resources from adc", zap.Any("result", result))
+	return result, nil
 }
 
 // adcRouteResource implements RouteResource
diff --git a/test/e2e/scaffold/api7_deployer.go b/test/e2e/scaffold/api7_deployer.go
diff --git a/test/e2e/scaffold/apisix_deployer.go b/test/e2e/scaffold/apisix_deployer.go
diff --git a/test/e2e/scaffold/deployer.go b/test/e2e/scaffold/deployer.go
diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (r *ApisixGlobalRuleReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`98`	`98`	`// process IngressClass parameters if they reference GatewayProxy`
`99`	`99`	`if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, &globalRule, ingressClass); err != nil {`
`100`	`100`	`r.Log.Error(err, "failed to process IngressClass parameters", "ingressClass", ingressClass.Name)`
`101`		`- return ctrl.Result{}, err`
	`101`	`+ return ctrl.Result{}, client.IgnoreNotFound(err)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`// Sync the global rule to APISIX`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (r *IngressClassReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`98`	`98`
`99`	`99`	`if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, ingressClass, ingressClass); err != nil {`
`100`	`100`	`r.Log.Error(err, "failed to process infrastructure for ingressclass", "ingressclass", ingressClass.GetName())`
`101`		`- return ctrl.Result{}, err`
	`101`	`+ return ctrl.Result{}, client.IgnoreNotFound(err)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if err := r.Provider.Update(ctx, tctx, ingressClass); err != nil {`