chore: cleanups from envoyproxy#6597 (envoyproxy#6647)

jukie · zirain · commit 84b894069841 · 2025-08-05T08:36:59.000+08:00
Cleanup

Signed-off-by: jukie &lt;10012479+Jukie@users.noreply.github.com&gt;
diff --git a/internal/gatewayapi/globalresources.go b/internal/gatewayapi/globalresources.go
@@ -32,6 +32,11 @@ func (t *Translator) ProcessGlobalResources(resources *resource.Resources, xdsIR
 			xdsIRs[irKey].GlobalResources = &ir.GlobalResources{}
 		}
 		xdsIRs[irKey].GlobalResources.ProxyServiceCluster = rDest
+
+		// For merged gateways we only need to process once
+		if t.MergeGateways {
+			break
+		}
 	}
 
 	// Get the envoy client TLS secret. It is used for envoy to establish a TLS connection with control plane components,
diff --git a/internal/provider/kubernetes/predicates.go b/internal/provider/kubernetes/predicates.go
@@ -614,7 +614,7 @@ func (r *gatewayAPIReconciler) validateEndpointSliceForReconcile(obj client.Obje
 		}
 	}
 
-	if r.isProxyServiceCluster(&nsName) {
+	if r.isProxyServiceCluster(ep.GetLabels()) {
 		return true
 	}
 	return false
@@ -940,23 +940,13 @@ func (r *gatewayAPIReconciler) isRouteReferencingHTTPRouteFilter(nsName *types.N
 	return len(httpRouteList.Items) != 0
 }
 
-func (r *gatewayAPIReconciler) isProxyServiceCluster(nn *types.NamespacedName) bool {
-	ctx := context.Background()
-	svc := &corev1.Service{}
-	if err := r.client.Get(ctx, *nn, svc); err != nil {
-		r.log.Error(err, "unable to find associated proxy ServiceCluster")
-		return false
-	}
-
-	svcLabels := svc.GetLabels()
-
-	// Check if service belongs to a Gateway
-	if gtw := r.findOwningGateway(ctx, svcLabels); gtw != nil {
+// isProxyServiceCluster returns true if the provided labels reference an owning Gateway or GatewayClass
+func (r *gatewayAPIReconciler) isProxyServiceCluster(labels map[string]string) bool {
+	if gtw := r.findOwningGateway(context.Background(), labels); gtw != nil {
 		return true
 	}
 
-	// Check if service belongs to a GatewayClass
-	gcName, ok := svcLabels[gatewayapi.OwningGatewayClassLabel]
+	gcName, ok := labels[gatewayapi.OwningGatewayClassLabel]
 	if ok && r.mergeGateways.Has(gcName) {
 		return true
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ func (t Translator) ProcessGlobalResources(resources resource.Resources, xdsIR`
`32`	`32`	`xdsIRs[irKey].GlobalResources = &ir.GlobalResources{}`
`33`	`33`	`}`
`34`	`34`	`xdsIRs[irKey].GlobalResources.ProxyServiceCluster = rDest`
	`35`	`+`
	`36`	`+ // For merged gateways we only need to process once`
	`37`	`+ if t.MergeGateways {`
	`38`	`+ break`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`// Get the envoy client TLS secret. It is used for envoy to establish a TLS connection with control plane components,`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ func (r *gatewayAPIReconciler) validateEndpointSliceForReconcile(obj client.Obje`
`614`	`614`	`}`
`615`	`615`	`}`
`616`	`616`
`617`		`- if r.isProxyServiceCluster(&nsName) {`
	`617`	`+ if r.isProxyServiceCluster(ep.GetLabels()) {`
`618`	`618`	`return true`
`619`	`619`	`}`
`620`	`620`	`return false`
`@@ -940,23 +940,13 @@ func (r gatewayAPIReconciler) isRouteReferencingHTTPRouteFilter(nsName types.N`
`940`	`940`	`return len(httpRouteList.Items) != 0`
`941`	`941`	`}`
`942`	`942`
`943`		`-func (r gatewayAPIReconciler) isProxyServiceCluster(nn types.NamespacedName) bool {`
`944`		`- ctx := context.Background()`
`945`		`- svc := &corev1.Service{}`
`946`		`- if err := r.client.Get(ctx, *nn, svc); err != nil {`
`947`		`- r.log.Error(err, "unable to find associated proxy ServiceCluster")`
`948`		`- return false`
`949`		`- }`
`950`		`-`
`951`		`- svcLabels := svc.GetLabels()`
`952`		`-`
`953`		`- // Check if service belongs to a Gateway`
`954`		`- if gtw := r.findOwningGateway(ctx, svcLabels); gtw != nil {`
	`943`	`+// isProxyServiceCluster returns true if the provided labels reference an owning Gateway or GatewayClass`
	`944`	`+func (r *gatewayAPIReconciler) isProxyServiceCluster(labels map[string]string) bool {`
	`945`	`+ if gtw := r.findOwningGateway(context.Background(), labels); gtw != nil {`
`955`	`946`	`return true`
`956`	`947`	`}`
`957`	`948`
`958`		`- // Check if service belongs to a GatewayClass`
`959`		`- gcName, ok := svcLabels[gatewayapi.OwningGatewayClassLabel]`
	`949`	`+ gcName, ok := labels[gatewayapi.OwningGatewayClassLabel]`
`960`	`950`	`if ok && r.mergeGateways.Has(gcName) {`
`961`	`951`	`return true`
`962`	`952`	`}`