fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/controller/apisixconsumer_controller.go

@@ -100,12 +100,12 @@ func (r *ApisixConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	if err = ProcessIngressClassParameters(tctx, r.Client, r.Log, ac, 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)
 	}
 
 	if err = r.processSpec(ctx, tctx, ac); err != nil {
 		r.Log.Error(err, "failed to process ApisixConsumer spec", "object", ac)
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	if err = r.Provider.Update(ctx, tctx, ac); err != nil {

internal/controller/apisixroute_controller.go

@@ -168,7 +168,8 @@ func (r *ApisixRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	defer func() { r.updateStatus(&ar, err) }()
 
 	if err = ProcessIngressClassParameters(tctx, r.Client, r.Log, &ar, ic); err != nil {
-		return ctrl.Result{}, err
+		r.Log.Error(err, "failed to process IngressClass parameters", "ingressClass", ic.Name)
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 	if err = r.processApisixRoute(ctx, tctx, &ar); err != nil {
 		return ctrl.Result{}, err

internal/controller/utils.go

@@ -1644,42 +1644,6 @@ func filterEndpointSliceByTargetPod(ctx context.Context, c client.Client, item d
 	return item
 }
 
-func MatchesIngressClassPredicate(c client.Client, log logr.Logger, apiVersion string) predicate.Funcs {
-	predicateFuncs := predicate.NewPredicateFuncs(func(obj client.Object) bool {
-		return MatchesIngressClass(c, log, obj, apiVersion)
-	})
-	predicateFuncs.UpdateFunc = func(e event.UpdateEvent) bool {
-		return MatchesIngressClass(c, log, e.ObjectOld, apiVersion) || MatchesIngressClass(c, log, e.ObjectNew, apiVersion)
-	}
-	return predicateFuncs
-}
-
-func MatchesIngressClass(c client.Client, log logr.Logger, obj client.Object, apiVersion string) bool {
-	_, err := FindMatchingIngressClassByObject(context.Background(), c, log, obj, apiVersion)
-	return err == nil
-}
-
-func ExtractIngressClass(obj client.Object) string {
-	switch v := obj.(type) {
-	case *networkingv1.Ingress:
-		return ptr.Deref(v.Spec.IngressClassName, "")
-	case *apiv2.ApisixConsumer:
-		return v.Spec.IngressClassName
-	case *apiv2.ApisixRoute:
-		return v.Spec.IngressClassName
-	case *apiv2.ApisixTls:
-		return v.Spec.IngressClassName
-	case *apiv2.ApisixPluginConfig:
-		return v.Spec.IngressClassName
-	case *apiv2.ApisixUpstream:
-		return v.Spec.IngressClassName
-	case *apiv2.ApisixGlobalRule:
-		return v.Spec.IngressClassName
-	default:
-		panic(fmt.Errorf("unhandled object type %T for extracting ingress class", obj))
-	}
-}
-
 func GetGatewayProxyByIngressClass(ctx context.Context, r client.Client, ingressClass *networkingv1.IngressClass) (*v1alpha1.GatewayProxy, error) {
 	if ingressClass.Spec.Parameters == nil {
 		return nil, nil
@@ -1729,3 +1693,39 @@ func GetGatewayProxyByGateway(ctx context.Context, r client.Client, gateway *gat
 	}
 	return gatewayProxy, nil
 }
+
+func MatchesIngressClassPredicate(c client.Client, log logr.Logger, apiVersion string) predicate.Funcs {
+	predicateFuncs := predicate.NewPredicateFuncs(func(obj client.Object) bool {
+		return MatchesIngressClass(c, log, obj, apiVersion)
+	})
+	predicateFuncs.UpdateFunc = func(e event.UpdateEvent) bool {
+		return MatchesIngressClass(c, log, e.ObjectOld, apiVersion) || MatchesIngressClass(c, log, e.ObjectNew, apiVersion)
+	}
+	return predicateFuncs
+}
+
+func MatchesIngressClass(c client.Client, log logr.Logger, obj client.Object, apiVersion string) bool {
+	_, err := FindMatchingIngressClassByObject(context.Background(), c, log, obj, apiVersion)
+	return err == nil
+}
+
+func ExtractIngressClass(obj client.Object) string {
+	switch v := obj.(type) {
+	case *networkingv1.Ingress:
+		return ptr.Deref(v.Spec.IngressClassName, "")
+	case *apiv2.ApisixConsumer:
+		return v.Spec.IngressClassName
+	case *apiv2.ApisixRoute:
+		return v.Spec.IngressClassName
+	case *apiv2.ApisixTls:
+		return v.Spec.IngressClassName
+	case *apiv2.ApisixPluginConfig:
+		return v.Spec.IngressClassName
+	case *apiv2.ApisixUpstream:
+		return v.Spec.IngressClassName
+	case *apiv2.ApisixGlobalRule:
+		return v.Spec.IngressClassName
+	default:
+		panic(fmt.Errorf("unhandled object type %T for extracting ingress class", obj))
+	}
+}