fix: r

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

Author: ronething

internal/controller/apisixroute_controller.go

@@ -378,7 +378,7 @@ func (r *ApisixRouteReconciler) validateBackends(ctx context.Context, tc *provid
 		subsetLabels := r.getSubsetLabels(tc, serviceNN, backend)
 
 		// Collect endpoints with EndpointSlice support and subset filtering
-		if err := collectEndpointsWithEndpointSliceSupport(ctx, r.Client, tc, serviceNN, r.supportsEndpointSlice, subsetLabels); err != nil {
+		if err := resolveServiceEndpoints(ctx, r.Client, tc, serviceNN, r.supportsEndpointSlice, subsetLabels); err != nil {
 			return types.ReasonError{
 				Reason:  string(apiv2.ConditionReasonInvalidSpec),
 				Message: err.Error(),

internal/controller/gatewayproxy_controller.go

@@ -123,7 +123,7 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 			return reconcile.Result{}, err
 		}
 		tctx.Services[serviceNN] = service
-		if err := collectEndpointsWithEndpointSliceSupport(tctx, r.Client, tctx, serviceNN, r.supportsEndpointSlice, nil); err != nil {
+		if err := resolveServiceEndpoints(tctx, r.Client, tctx, serviceNN, r.supportsEndpointSlice, nil); err != nil {
 			return reconcile.Result{}, err
 		}
 	}

internal/controller/httproute_controller.go

@@ -571,7 +571,7 @@ func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.Transla
 		tctx.Services[targetNN] = &service
 
 		// Collect endpoints with EndpointSlice support
-		if err := collectEndpointsWithEndpointSliceSupport(tctx, r.Client, tctx, targetNN, r.supportsEndpointSlice, nil); err != nil {
+		if err := resolveServiceEndpoints(tctx, r.Client, tctx, targetNN, r.supportsEndpointSlice, nil); err != nil {
 			r.Log.Error(err, "failed to collect endpoints", "Service", targetNN)
 			terr = err
 			continue

internal/controller/ingress_controller.go

@@ -607,7 +607,7 @@ func (r *IngressReconciler) processBackendService(tctx *provider.TranslateContex
 	}
 
 	// Collect endpoints with EndpointSlice support
-	if err := collectEndpointsWithEndpointSliceSupport(tctx, r.Client, tctx, serviceNS, r.supportsEndpointSlice, nil); err != nil {
+	if err := resolveServiceEndpoints(tctx, r.Client, tctx, serviceNS, r.supportsEndpointSlice, nil); err != nil {
 		r.Log.Error(err, "failed to collect endpoints", "namespace", namespace, "name", backendService.Name)
 		return err
 	}

internal/controller/utils.go

@@ -1492,7 +1492,7 @@ func addProviderEndpointsToTranslateContext(tctx *provider.TranslateContext, c c
 	}
 	tctx.Services[serviceNN] = &service
 
-	return collectEndpointsWithEndpointSliceSupport(tctx, c, tctx, serviceNN, true, nil)
+	return resolveServiceEndpoints(tctx, c, tctx, serviceNN, true, nil)
 }
 
 func TypePredicate[T client.Object]() func(obj client.Object) bool {
@@ -1546,9 +1546,9 @@ func watchEndpointSliceOrEndpoints(bdr *ctrl.Builder, supportsEndpointSlice bool
 	}
 }
 
-// collectEndpointsWithEndpointSliceSupport collects endpoints and adds them to the translate context
+// resolveServiceEndpoints collects endpoints and adds them to the translate context
 // It handles both EndpointSlice (K8s 1.19+) and Endpoints (K8s 1.18) APIs with automatic fallback
-func collectEndpointsWithEndpointSliceSupport(
+func resolveServiceEndpoints(
 	ctx context.Context,
 	c client.Client,
 	tctx *provider.TranslateContext,