remove metadata for tcp and udp listeners

zhaohuabing · zhaohuabing · commit 6a90775acbbd · 2025-07-21T09:09:09.000Z
Signed-off-by: Huabing (Robin) Zhao &lt;zhaohuabing@gmail.com&gt;
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -1338,10 +1338,6 @@ xds:
                   statPrefix: tcp-1234
               name: tcproute/default/backend
             maxConnectionsToAcceptPerSocketEvent: 1
-            metadata:
-              filterMetadata:
-                envoy-gateway:
-                  resources: []
             name: default/eg/tcp
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -1433,10 +1429,6 @@ xds:
               typedConfig:
                 '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
             maxConnectionsToAcceptPerSocketEvent: 1
-            metadata:
-              filterMetadata:
-                envoy-gateway:
-                  resources: []
             name: default/eg/tls-passthrough
             perConnectionBufferLimitBytes: 32768
       - activeState:
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -1270,13 +1270,6 @@
                     }
                   ],
                   "maxConnectionsToAcceptPerSocketEvent": 1,
-                  "metadata": {
-                    "filterMetadata": {
-                      "envoy-gateway": {
-                        "resources": []
-                      }
-                    }
-                  },
                   "name": "default/eg/tcp",
                   "perConnectionBufferLimitBytes": 32768
                 }
@@ -1402,13 +1395,6 @@
                     }
                   ],
                   "maxConnectionsToAcceptPerSocketEvent": 1,
-                  "metadata": {
-                    "filterMetadata": {
-                      "envoy-gateway": {
-                        "resources": []
-                      }
-                    }
-                  },
                   "name": "default/eg/tls-passthrough",
                   "perConnectionBufferLimitBytes": 32768
                 }
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -791,10 +791,6 @@ xds:
                   statPrefix: tcp-1234
               name: tcproute/default/backend
             maxConnectionsToAcceptPerSocketEvent: 1
-            metadata:
-              filterMetadata:
-                envoy-gateway:
-                  resources: []
             name: default/eg/tcp
             perConnectionBufferLimitBytes: 32768
       - activeState:
@@ -886,10 +882,6 @@ xds:
               typedConfig:
                 '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
             maxConnectionsToAcceptPerSocketEvent: 1
-            metadata:
-              filterMetadata:
-                envoy-gateway:
-                  resources: []
             name: default/eg/tls-passthrough
             perConnectionBufferLimitBytes: 32768
       - activeState:
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml
@@ -355,10 +355,6 @@ xds:
                 statPrefix: tcp-1234
             name: tcproute/default/backend
           maxConnectionsToAcceptPerSocketEvent: 1
-          metadata:
-            filterMetadata:
-              envoy-gateway:
-                resources: []
           name: default/eg/tcp
           perConnectionBufferLimitBytes: 32768
     - activeState:
@@ -450,10 +446,6 @@ xds:
             typedConfig:
               '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
           maxConnectionsToAcceptPerSocketEvent: 1
-          metadata:
-            filterMetadata:
-              envoy-gateway:
-                resources: []
           name: default/eg/tls-passthrough
           perConnectionBufferLimitBytes: 32768
     - activeState:
diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml
@@ -54,10 +54,6 @@
         statPrefix: tcp-10081
     name: tcp-route-dest
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 1500
 - address:
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml
@@ -54,9 +54,5 @@
         statPrefix: tcp-10081
     name: tcp-route-dest
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 1500
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-stream-idle-timeout.listeners.yaml
@@ -58,13 +58,5 @@
         statPrefix: tcp-10081
     name: second-route
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources:
-        - kind: Gateway
-          name: gateway-1
-          namespace: envoy-gateway
-          sectionName: tcp
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml
@@ -57,13 +57,5 @@
         statPrefix: tcp-10081
     name: second-route
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources:
-        - kind: Gateway
-          name: gateway-1
-          namespace: envoy-gateway
-          sectionName: tcp
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml
@@ -105,10 +105,6 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: third-listener
   perConnectionBufferLimitBytes: 32768
 - address:
@@ -129,9 +125,5 @@
         cluster: tcp-route-dest
         statPrefix: tcp-10083
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: fourth-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml
@@ -83,9 +83,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml
@@ -117,10 +117,6 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: third-listener
   perConnectionBufferLimitBytes: 32768
   socketOptions:
@@ -140,10 +136,6 @@
         cluster: tcp-route-dest
         statPrefix: tcp-10083
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: fourth-listener
   perConnectionBufferLimitBytes: 32768
   socketOptions:
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml
@@ -22,10 +22,6 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: envoy-gateway/gateway-1/tls-1
   perConnectionBufferLimitBytes: 50000000
   socketOptions:
diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.listeners.yaml
@@ -49,10 +49,6 @@
         cluster: max-accept-disabled
         statPrefix: tcp-10081
     name: max-accept-disabled
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
 - address:
@@ -68,9 +64,5 @@
         statPrefix: tcp-10082
     name: max-accept-default
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: third-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml
@@ -39,9 +39,5 @@
         statPrefix: tcp-10080
     name: tcp-route-simple-4
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-simple
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml
@@ -97,9 +97,5 @@
         disableStatelessSessionResumption: true
         requireClientCertificate: false
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.listeners.yaml
@@ -143,9 +143,5 @@
         disableStatelessSessionResumption: true
         requireClientCertificate: true
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml
@@ -97,9 +97,5 @@
         disableStatelessSessionResumption: true
         requireClientCertificate: true
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml
@@ -10,9 +10,5 @@
         cluster: tcp-route-simple-dest
         statPrefix: tcp-10080
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-route-enable-endpoint-stats
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml
@@ -12,9 +12,5 @@
         statPrefix: tcp-8082
     name: tcp-route-dual
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-dual
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml
@@ -10,9 +10,5 @@
         cluster: tcp-route-simple-dest
         statPrefix: tcp-10080
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-route-enable-req-resp-sizes-stats
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml
@@ -20,9 +20,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-complex
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml
@@ -11,9 +11,5 @@
         statPrefix: tcp-10080
     name: tcp-route-simple
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-simple
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml
@@ -50,9 +50,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tls-listener-terminate
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml
@@ -20,9 +20,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-weighted-backend
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-with-no-routes.listeners.yaml
@@ -11,9 +11,5 @@
         statPrefix: tcp-10080
     name: EmptyCluster
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tcp-listener-with-no-routes
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml
@@ -18,10 +18,6 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tls-passthrough-foo
   perConnectionBufferLimitBytes: 32768
 - address:
@@ -44,9 +40,5 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: tls-passthrough-bar
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml
@@ -129,9 +129,5 @@
             tlsMinimumProtocolVersion: TLSv1_0
         disableStatefulSessionResumption: true
   maxConnectionsToAcceptPerSocketEvent: 1
-  metadata:
-    filterMetadata:
-      envoy-gateway:
-        resources: []
   name: second-listener
   perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go
