debug ci

Author: AlinsRan

internal/controller/indexer/indexer.go

@@ -57,10 +57,13 @@ func SetupIndexer(mgr ctrl.Manager) error {
 
 	// Gateway API indexers - conditional setup based on API availability
 	for resource, setup := range map[client.Object]func(ctrl.Manager) error{
-		&gatewayv1.Gateway{}:      setupGatewayIndexer,
-		&gatewayv1.HTTPRoute{}:    setupHTTPRouteIndexer,
-		&gatewayv1.GatewayClass{}: setupGatewayClassIndexer,
-		&v1alpha1.Consumer{}:      setupConsumerIndexer,
+		&gatewayv1.Gateway{}:              setupGatewayIndexer,
+		&gatewayv1.HTTPRoute{}:            setupHTTPRouteIndexer,
+		&gatewayv1.GatewayClass{}:         setupGatewayClassIndexer,
+		&v1alpha1.Consumer{}:              setupConsumerIndexer,
+		&networkingv1.Ingress{}:           setupIngressIndexer,
+		&networkingv1.IngressClass{}:      setupIngressClassIndexer,
+		&networkingv1beta1.IngressClass{}: setupIngressClassV1beta1Indexer,
 	} {
 		if utils.HasAPIResource(mgr, resource) {
 			if err := setup(mgr); err != nil {
@@ -82,9 +85,7 @@ func SetupIndexer(mgr ctrl.Manager) error {
 
 	// Core Kubernetes and APISIX indexers - always setup these
 	for _, setup := range []func(ctrl.Manager) error{
-		setupIngressIndexer,
 		setupBackendTrafficPolicyIndexer,
-		setupIngressClassIndexer,
 		setupGatewayProxyIndexer,
 		setupApisixRouteIndexer,
 		setupApisixPluginConfigIndexer,

internal/manager/controllers.go

@@ -105,14 +105,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
 	var controllers []Controller
 
 	icgvk := types.GvkOf(&v1.IngressClass{})
-	if utils.HasAPIResource(mgr, &v1.IngressClass{}) {
-		controllers = append(controllers, &controller.IngressClassReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("IngressClass"),
-			Provider: pro,
-		})
-	} else {
+	if !utils.HasAPIResource(mgr, &v1.IngressClass{}) {
 		setupLog.Info("IngressClass v1 not found, falling back to IngressClass v1beta1")
 		icgvk = types.GvkOf(&v1beta1.IngressClass{})
 		controllers = append(controllers, &controller.IngressClassV1beta1Reconciler{
@@ -162,6 +155,12 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
 			Updater:  updater,
 			Readier:  readier,
 		},
+		&v1.IngressClass{}: &controller.IngressClassReconciler{
+			Client:   mgr.GetClient(),
+			Scheme:   mgr.GetScheme(),
+			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("IngressClass"),
+			Provider: pro,
+		},
 	} {
 		if utils.HasAPIResource(mgr, resource) {
 			controllers = append(controllers, controller)