fix: review

Signed-off-by: ashing <[email protected]>

Author: ronething

internal/controller/ingress_controller.go

@@ -42,7 +42,12 @@ func (r *IngressReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				predicate.NewPredicateFuncs(r.checkIngressClass),
 			),
 		).
-		WithEventFilter(CombinedPredicate{}).
+		WithEventFilter(
+			predicate.Or(
+				predicate.GenerationChangedPredicate{},
+				predicate.AnnotationChangedPredicate{},
+			),
+		).
 		Watches(
 			&networkingv1.IngressClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listIngressForIngressClass),

internal/controller/utils.go

@@ -3,19 +3,15 @@ package controller
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"strings"
 
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
-	"github.com/api7/gopkg/pkg/log"
 	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/event"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
@@ -763,40 +759,3 @@ func SplitMetaNamespaceKey(key string) (namespace, name string, err error) {
 
 	return "", "", fmt.Errorf("unexpected key format: %q", key)
 }
-
-type CombinedPredicate struct {
-	predicate.GenerationChangedPredicate
-}
-
-func (c CombinedPredicate) Update(e event.UpdateEvent) bool {
-	if isNil(e.ObjectOld) {
-		log.Debugw("Update event has no old object for update")
-		return false
-	}
-	if isNil(e.ObjectNew) {
-		log.Debugw("Update event has no new object for update")
-		return false
-	}
-
-	_, ok := e.ObjectNew.(*networkingv1.IngressClass)
-	if ok {
-		log.Debugw("IngressClass update event")
-		return true
-	}
-
-	log.Debugw("other update event")
-	// if the object is not IngressClass, return the result of GenerationChangedPredicate.Update
-	return c.GenerationChangedPredicate.Update(e)
-}
-
-func isNil(arg any) bool {
-	if v := reflect.ValueOf(arg); !v.IsValid() || ((v.Kind() == reflect.Ptr ||
-		v.Kind() == reflect.Interface ||
-		v.Kind() == reflect.Slice ||
-		v.Kind() == reflect.Map ||
-		v.Kind() == reflect.Chan ||
-		v.Kind() == reflect.Func) && v.IsNil()) {
-		return true
-	}
-	return false
-}

test/e2e/ingress/ingress.go

@@ -71,11 +71,6 @@ spec:
 			Expect(err).NotTo(HaveOccurred(), "creating Ingress")
 			time.Sleep(5 * time.Second)
 
-			By("check Ingress status")
-			ingressYaml, err := s.GetResourceYaml("Ingress", "api7-ingress")
-			Expect(err).NotTo(HaveOccurred(), "getting Ingress yaml")
-			Expect(ingressYaml).To(ContainSubstring("example.com"), "checking Ingress host")
-
 			By("verify HTTP request")
 			s.NewAPISIXClient().
 				GET("/get").
@@ -185,11 +180,6 @@ spec:
 			Expect(err).NotTo(HaveOccurred(), "creating Ingress without IngressClass")
 			time.Sleep(5 * time.Second)
 
-			By("check Default Ingress")
-			ingressYaml, err := s.GetResourceYaml("Ingress", "api7-ingress-default")
-			Expect(err).NotTo(HaveOccurred(), "getting Default Ingress yaml")
-			Expect(ingressYaml).To(ContainSubstring("default.example.com"), "checking Default Ingress host")
-
 			By("verify default ingress")
 			s.NewAPISIXClient().
 				GET("/get").