fix test

Author: AlinsRan

internal/controller/apisixglobalrule_controller.go

@@ -165,10 +165,7 @@ func (r *ApisixGlobalRuleReconciler) checkIngressClass(obj client.Object) bool {
 
 // listGlobalRulesForIngressClass list all global rules that use a specific ingress class
 func (r *ApisixGlobalRuleReconciler) listGlobalRulesForIngressClass(ctx context.Context, obj client.Object) []reconcile.Request {
-	ingressClass, ok := obj.(*networkingv1.IngressClass)
-	if !ok {
-		return nil
-	}
+	ingressClass := convertIngressClass(obj)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/apisixroute_controller.go

@@ -30,6 +30,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	networkingv1 "k8s.io/api/networking/v1"
+	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -77,7 +78,7 @@ func (r *ApisixRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			),
 		).
 		Watches(
-			&networkingv1.IngressClass{},
+			&networkingv1beta1.IngressClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listApisixRouteForIngressClass),
 			builder.WithPredicates(
 				predicate.NewPredicateFuncs(matchesIngressController),
@@ -498,10 +499,7 @@ func (r *ApisixRouteReconciler) listApisixRoutesForSecret(ctx context.Context, o
 }
 
 func (r *ApisixRouteReconciler) listApisixRouteForIngressClass(ctx context.Context, object client.Object) (requests []reconcile.Request) {
-	ingressClass, ok := object.(*networkingv1.IngressClass)
-	if !ok {
-		return nil
-	}
+	ingressClass := convertIngressClass(object)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/apisixtls_controller.go

@@ -264,10 +264,7 @@ func (r *ApisixTlsReconciler) listApisixTlsForSecret(ctx context.Context, obj cl
 
 // listApisixTlsForIngressClass list all TLS that use a specific ingress class
 func (r *ApisixTlsReconciler) listApisixTlsForIngressClass(ctx context.Context, obj client.Object) []reconcile.Request {
-	ingressClass, ok := obj.(*networkingv1.IngressClass)
-	if !ok {
-		return nil
-	}
+	ingressClass = convertIngressClass(obj)
 
 	return ListMatchingRequests(
 		ctx,

internal/controller/utils.go

@@ -1259,10 +1259,7 @@ func listIngressClassRequestsForGatewayProxy(
 }
 
 func matchesIngressController(obj client.Object) bool {
-	ingressClass, ok := obj.(*networkingv1.IngressClass)
-	if !ok {
-		return false
-	}
+	ingressClass := convertIngressClass(obj)
 	return matchesController(ingressClass.Spec.Controller)
 }
 

test/e2e/crds/v2/route.go

@@ -59,7 +59,7 @@ var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixrou
 
 	Context("Test ApisixRoute", func() {
 
-		It("Basic tests", func() {
+		FIt("Basic tests", func() {
 			const apisixRouteSpec = `
 apiVersion: apisix.apache.org/v2
 kind: ApisixRoute