fix: only add selector when Gateway is in dataplane namespace

Kubernetes Service selectors only match pods within the same namespace.
For cross-namespace Gateways (e.g. gateway-conformance-infra), adding a
selector pointing to pods in nantian-gw namespace is incorrect and breaks
conformance tests.

Only add the selector when gateway.Namespace == defaultDataplaneNamespace.

Author: mahmut-Abi

internal/infrastructure/reconciler_core_test.go

@@ -156,8 +156,8 @@ func TestReconcileCreatesGatewayInfrastructureServiceAndUpdatesSharedPorts(t *te
 	if gatewayService.Annotations["example.com/trace"] != "enabled" {
 		t.Fatalf("expected propagated annotation, got %#v", gatewayService.Annotations)
 	}
-	if gatewayService.Spec.Selector == nil || gatewayService.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", gatewayService.Spec.Selector)
+	if gatewayService.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", gatewayService.Spec.Selector)
 	}
 	assertServicePort(t, gatewayService.Spec.Ports, 8080, corev1.ProtocolTCP, 0)
 	assertServicePort(t, gatewayService.Spec.Ports, 5300, corev1.ProtocolUDP, 0)

internal/infrastructure/reconciler_mesh_test.go

@@ -982,8 +982,8 @@ func TestReconcileFrontsSharedAndGatewayServicesOnlyWithAckedCurrentSnapshotNode
 	if err != nil {
 		t.Fatalf("Get gateway Service returned error: %v", err)
 	}
-	if gatewayService.Spec.Selector == nil || gatewayService.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", gatewayService.Spec.Selector)
+	if gatewayService.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", gatewayService.Spec.Selector)
 	}
 
 	var sharedSlices discoveryv1.EndpointSliceList

internal/infrastructure/reconciler_parameters_test.go

@@ -314,8 +314,8 @@ allocateLoadBalancerNodePorts: false
 	if service.Spec.Type != corev1.ServiceTypeLoadBalancer {
 		t.Fatalf("service type = %s, want LoadBalancer", service.Spec.Type)
 	}
-	if service.Spec.Selector == nil || service.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", service.Spec.Selector)
+	if service.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", service.Spec.Selector)
 	}
 	if service.Spec.ExternalTrafficPolicy != corev1.ServiceExternalTrafficPolicyLocal {
 		t.Fatalf("externalTrafficPolicy = %s, want Local", service.Spec.ExternalTrafficPolicy)
@@ -574,8 +574,8 @@ func TestReconcileIgnoresInvalidGatewayInfrastructureParametersRef(t *testing.T)
 	if service.Spec.Type != corev1.ServiceTypeClusterIP {
 		t.Fatalf("service type = %s, want ClusterIP fallback", service.Spec.Type)
 	}
-	if service.Spec.Selector == nil || service.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", service.Spec.Selector)
+	if service.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", service.Spec.Selector)
 	}
 	if service.Spec.ExternalTrafficPolicy != "" {
 		t.Fatalf("externalTrafficPolicy = %q, want empty", service.Spec.ExternalTrafficPolicy)
@@ -687,8 +687,8 @@ allocateLoadBalancerNodePorts: false
 	if service.Spec.Type != corev1.ServiceTypeLoadBalancer {
 		t.Fatalf("service type = %s, want LoadBalancer", service.Spec.Type)
 	}
-	if service.Spec.Selector == nil || service.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", service.Spec.Selector)
+	if service.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", service.Spec.Selector)
 	}
 	if service.Spec.ExternalTrafficPolicy != corev1.ServiceExternalTrafficPolicyLocal {
 		t.Fatalf("externalTrafficPolicy = %s, want Local", service.Spec.ExternalTrafficPolicy)
@@ -783,8 +783,8 @@ func TestReconcileResetsGatewayServiceFieldsWhenParametersRefRemoved(t *testing.
 	if service.Spec.Type != corev1.ServiceTypeClusterIP {
 		t.Fatalf("service type = %s, want ClusterIP", service.Spec.Type)
 	}
-	if service.Spec.Selector == nil || service.Spec.Selector["app"] != "nantian-gw-dataplane" {
-		t.Fatalf("gateway service selector = %#v, want map[app:nantian-gw-dataplane]", service.Spec.Selector)
+	if service.Spec.Selector != nil {
+		t.Fatalf("gateway service selector = %#v, want nil with managed EndpointSlices", service.Spec.Selector)
 	}
 	if service.Spec.ExternalTrafficPolicy != "" {
 		t.Fatalf("externalTrafficPolicy = %q, want empty", service.Spec.ExternalTrafficPolicy)

internal/infrastructure/services.go

@@ -98,11 +98,16 @@ func desiredGatewayService(
 			OwnerReferences: desiredGatewayServiceOwnerReferences(gateway),
 		},
 		Spec: corev1.ServiceSpec{
-			Type:     corev1.ServiceTypeClusterIP,
-			Selector: map[string]string{"app": "nantian-gw-dataplane"},
+			Type: corev1.ServiceTypeClusterIP,
 		},
 	}
 
+	// Add Selector only when the Gateway is in the same namespace as dataplane pods;
+	// cross-namespace gateways rely on managed EndpointSlices.
+	if gateway.Namespace == defaultDataplaneNamespace {
+		desired.Spec.Selector = map[string]string{"app": "nantian-gw-dataplane"}
+	}
+
 	if current.Name != "" {
 		desired.ResourceVersion = current.ResourceVersion
 		desired.UID = current.UID