fix: r

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

Author: ronething

internal/controller/indexer/indexer.go

@@ -90,8 +90,6 @@ func SetupIndexer(mgr ctrl.Manager) error {
 
 	// Core Kubernetes and APISIX indexers - always setup these
 	for _, setup := range []func(ctrl.Manager) error{
-<<<<<<< HEAD
-=======
 		setupGatewayIndexer,
 		setupHTTPRouteIndexer,
 		setupTCPRouteIndexer,
@@ -100,12 +98,13 @@ func SetupIndexer(mgr ctrl.Manager) error {
 		setupConsumerIndexer,
 		setupBackendTrafficPolicyIndexer,
 		setupIngressClassIndexer,
->>>>>>> 0fd8e9d7 (feat: add support for TCPRoute (#2564))
 		setupGatewayProxyIndexer,
+		setupGatewaySecretIndex,
 		setupApisixRouteIndexer,
 		setupApisixPluginConfigIndexer,
 		setupApisixTlsIndexer,
 		setupApisixConsumerIndexer,
+		setupGatewayClassIndexer,
 	} {
 		if err := setup(mgr); err != nil {
 			return err

internal/manager/controllers.go

@@ -145,19 +145,15 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
 			Updater:  updater,
 			Readier:  readier,
 		},
-<<<<<<< HEAD
-		&gatewayv1.GRPCRoute{}: &controller.GRPCRouteReconciler{
-=======
-		&controller.TCPRouteReconciler{
+		&gatewayv1alpha2.TCPRoute{}: &controller.TCPRouteReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   mgr.GetScheme(),
 			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindTCPRoute),
 			Provider: pro,
 			Updater:  updater,
 			Readier:  readier,
 		},
-		&controller.GRPCRouteReconciler{
->>>>>>> 0fd8e9d7 (feat: add support for TCPRoute (#2564))
+		&gatewayv1.GRPCRoute{}: &controller.GRPCRouteReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   mgr.GetScheme(),
 			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindGRPCRoute),
@@ -252,57 +248,7 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
 			Scheme:  mgr.GetScheme(),
 			Log:     ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindApisixUpstream),
 			Updater: updater,
-<<<<<<< HEAD
 			ICGV:    icgv,
-=======
-		},
-		&controller.GatewayProxyController{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName(types.KindGatewayProxy),
-			Provider: pro,
-		},
-	}, nil
-}
-
-func registerReadinessGVK(c client.Client, readier readiness.ReadinessManager) {
-	log := ctrl.LoggerFrom(context.Background()).WithName("readiness")
-	readier.RegisterGVK([]readiness.GVKConfig{
-		{
-			GVKs: []schema.GroupVersionKind{
-				types.GvkOf(&gatewayv1.HTTPRoute{}),
-				types.GvkOf(&gatewayv1alpha2.TCPRoute{}),
-				types.GvkOf(&gatewayv1.GRPCRoute{}),
-			},
-		},
-		{
-			GVKs: []schema.GroupVersionKind{
-				types.GvkOf(&netv1.Ingress{}),
-				types.GvkOf(&apiv2.ApisixRoute{}),
-				types.GvkOf(&apiv2.ApisixGlobalRule{}),
-				types.GvkOf(&apiv2.ApisixPluginConfig{}),
-				types.GvkOf(&apiv2.ApisixTls{}),
-				types.GvkOf(&apiv2.ApisixConsumer{}),
-				types.GvkOf(&apiv2.ApisixUpstream{}),
-			},
-			Filter: readiness.GVKFilter(func(obj *unstructured.Unstructured) bool {
-				icName, _, _ := unstructured.NestedString(obj.Object, "spec", "ingressClassName")
-				ingressClass, _ := controller.FindMatchingIngressClassByName(context.Background(), c, log, icName)
-				return ingressClass != nil
-			}),
-		},
-		{
-			GVKs: []schema.GroupVersionKind{
-				types.GvkOf(&v1alpha1.Consumer{}),
-			},
-			Filter: readiness.GVKFilter(func(obj *unstructured.Unstructured) bool {
-				consumer := &v1alpha1.Consumer{}
-				if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, consumer); err != nil {
-					return false
-				}
-				return controller.MatchConsumerGatewayRef(context.Background(), c, log, consumer)
-			}),
->>>>>>> 0fd8e9d7 (feat: add support for TCPRoute (#2564))
 		},
 	}...)
 
@@ -356,6 +302,9 @@ func registerGatewayAPIForReadinessGVK(mgr manager.Manager, readier readiness.Re
 	if utils.HasAPIResource(mgr, &gatewayv1.GRPCRoute{}) {
 		gvks = append(gvks, types.GvkOf(&gatewayv1.GRPCRoute{}))
 	}
+	if utils.HasAPIResource(mgr, &gatewayv1alpha2.TCPRoute{}) {
+		gvks = append(gvks, types.GvkOf(&gatewayv1alpha2.TCPRoute{}))
+	}
 	if len(gvks) == 0 {
 		return
 	}