Use gateway namespace for namespaced mode

jukie · jukie · commit 5bc68909367c · 2025-07-29T22:07:57.000-06:00
Signed-off-by: jukie &lt;10012479+Jukie@users.noreply.github.com&gt;
diff --git a/internal/gatewayapi/globalresources.go b/internal/gatewayapi/globalresources.go
@@ -59,21 +59,14 @@ func (t *Translator) ProcessGlobalResources(resources *resource.Resources, xdsIR
 
 // processServiceClusterForGateway returns the matching IR key for a gateway and builds a RouteDestination to represent the ProxyServiceCluster
 func (t *Translator) processServiceClusterForGateway(gateway *GatewayContext, resources *resource.Resources) (string, *ir.RouteDestination) {
-	var (
-		labels = make(map[string]string)
-		irKey  string
-	)
-
-	if t.MergeGateways {
-		irKey = string(t.GatewayClassName)
-		labels[OwningGatewayClassLabel] = string(t.GatewayClassName)
-	} else {
-		irKey = irStringKey(gateway.Namespace, gateway.Name)
-		labels[OwningGatewayNamespaceLabel] = gateway.Namespace
-		labels[OwningGatewayNameLabel] = gateway.Name
-	}
+	irKey := t.getIRKey(gateway.Gateway)
+	labels := OwnerLabels(gateway.Gateway, t.MergeGateways)
 
-	svcCluster := resources.GetServiceByLabels(labels, t.ControllerNamespace)
+	svcClusterNamespace := t.ControllerNamespace
+	if t.GatewayNamespaceMode {
+		svcClusterNamespace = gateway.Namespace
+	}
+	svcCluster := resources.GetServiceByLabels(labels, svcClusterNamespace)
 
 	// Service lookup fails on first iteration
 	if svcCluster == nil {
diff --git a/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-namespace-mode-infra-httproute.out.yaml
@@ -396,16 +396,6 @@ xdsIR:
     accessLog:
       json:
       - path: /dev/stdout
-    globalResources:
-      proxyServiceCluster:
-        name: test-ns/gateway-3
-        settings:
-        - metadata:
-            name: envoy-default-gateway-1-bfd08ef4
-            namespace: envoy-gateway-system
-            sectionName: "8080"
-          name: test-ns/gateway-3
-          protocol: TCP
     http:
     - address: 0.0.0.0
       hostnames:
diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go
@@ -1357,7 +1357,7 @@ func (r *gatewayAPIReconciler) processGateways(ctx context.Context, managedGC *g
 	}
 
 	mergedGateways := false
-	if resourceTree.EnvoyProxyForGatewayClass != nil && resourceTree.EnvoyProxyForGatewayClass.Spec.MergeGateways != nil && *resourceTree.EnvoyProxyForGatewayClass.Spec.MergeGateways {
+	if r.mergeGateways.Has(managedGC.Name) {
 		mergedGateways = true
 		r.processServiceCluster(managedGC.Name, resourceMap)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ func (r gatewayAPIReconciler) processGateways(ctx context.Context, managedGC g`
`1357`	`1357`	`}`
`1358`	`1358`
`1359`	`1359`	`mergedGateways := false`
`1360`		`- if resourceTree.EnvoyProxyForGatewayClass != nil && resourceTree.EnvoyProxyForGatewayClass.Spec.MergeGateways != nil && *resourceTree.EnvoyProxyForGatewayClass.Spec.MergeGateways {`
	`1360`	`+ if r.mergeGateways.Has(managedGC.Name) {`
`1361`	`1361`	`mergedGateways = true`
`1362`	`1362`	`r.processServiceCluster(managedGC.Name, resourceMap)`
`1363`	`1363`	`}`