feat: support ir metadata to tcproute/udproute

Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>

Author: kkk777-7

internal/gatewayapi/listener.go

@@ -151,6 +151,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 						Address:      address,
 						Port:         uint32(containerPort),
 						ExternalPort: uint32(listener.Port),
+						Metadata:     buildListenerMetadata(listener, gateway),
 						IPFamily:     ipFamily,
 					},
 
@@ -168,6 +169,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 						Address:      address,
 						Port:         uint32(containerPort),
 						ExternalPort: uint32(listener.Port),
+						Metadata:     buildListenerMetadata(listener, gateway),
 					},
 				}
 				xdsIR[irKey].UDP = append(xdsIR[irKey].UDP, irListener)

internal/gatewayapi/route.go

@@ -1172,6 +1172,8 @@ func (t *Translator) processUDPRouteParentRefs(udpRoute *UDPRouteContext, resour
 			if irListener != nil {
 				irRoute := &ir.UDPRoute{
 					Name: irUDPRouteName(udpRoute),
+					// udpRoute Must have a single rule, so can use index 0.
+					Metadata: buildResourceMetadata(udpRoute, udpRoute.Spec.Rules[0].Name),
 					Destination: &ir.RouteDestination{
 						Name:     destName,
 						Settings: destSettings,
@@ -1322,6 +1324,8 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 			if irListener != nil {
 				irRoute := &ir.TCPRoute{
 					Name: irTCPRouteName(tcpRoute),
+					// tcpRoute Must have a single rule, so can use index 0.
+					Metadata: buildResourceMetadata(tcpRoute, tcpRoute.Spec.Rules[0].Name),
 					Destination: &ir.RouteDestination{
 						Name:     destName,
 						Settings: destSettings,

internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml

@@ -680,5 +680,10 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 53
+      metadata:
+        kind: Gateway
+        name: gateway-2
+        namespace: envoy-gateway
+        sectionName: tcp
       name: envoy-gateway/gateway-2/tcp
       port: 10053

internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml

@@ -259,6 +259,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 8089
+      metadata:
+        kind: Gateway
+        name: tcp-gateway
+        namespace: default
+        sectionName: bar
       name: default/tcp-gateway/bar
       port: 8089
       routes:
@@ -312,6 +317,10 @@ xdsIR:
         loadBalancer:
           consistentHash:
             sourceIP: true
+        metadata:
+          kind: TCPRoute
+          name: tls-app-1
+          namespace: default
         name: tcproute/default/tls-app-1
         proxyProtocol:
           version: V2
@@ -328,6 +337,11 @@ xdsIR:
     udp:
     - address: 0.0.0.0
       externalPort: 8162
+      metadata:
+        kind: Gateway
+        name: tcp-gateway
+        namespace: default
+        sectionName: foo
       name: default/tcp-gateway/foo
       port: 8162
       route:
@@ -352,4 +366,8 @@ xdsIR:
         loadBalancer:
           consistentHash:
             sourceIP: true
+        metadata:
+          kind: UDPRoute
+          name: udp-app-1
+          namespace: default
         name: udproute/default/udp-app-1

internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml

@@ -332,6 +332,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 8089
+      metadata:
+        kind: Gateway
+        name: tcp-gateway
+        namespace: default
+        sectionName: bar
       name: default/tcp-gateway/bar
       port: 8089
       routes:
@@ -385,6 +390,10 @@ xdsIR:
         loadBalancer:
           consistentHash:
             sourceIP: true
+        metadata:
+          kind: TCPRoute
+          name: tcp-app-1
+          namespace: default
         name: tcproute/default/tcp-app-1
         proxyProtocol:
           version: V2
@@ -401,6 +410,11 @@ xdsIR:
     udp:
     - address: 0.0.0.0
       externalPort: 8162
+      metadata:
+        kind: Gateway
+        name: tcp-gateway
+        namespace: default
+        sectionName: foo
       name: default/tcp-gateway/foo
       port: 8162
       route:
@@ -425,4 +439,8 @@ xdsIR:
         loadBalancer:
           consistentHash:
             sourceIP: true
+        metadata:
+          kind: UDPRoute
+          name: udp-app-1
+          namespace: default
         name: udproute/default/udp-app-1

internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml

@@ -216,6 +216,11 @@ xdsIR:
           closeDelay: 10s
           value: 3
       externalPort: 443
+      metadata:
+        kind: Gateway
+        name: gateway-1
+        namespace: envoy-gateway
+        sectionName: tls-1
       name: envoy-gateway/gateway-1/tls-1
       port: 10443
       proxyProtocol: {}
@@ -238,6 +243,10 @@ xdsIR:
             name: tcproute/default/tcproute-1/rule/-1/backend/0
             protocol: TCP
             weight: 1
+        metadata:
+          kind: TCPRoute
+          name: tcproute-1
+          namespace: default
         name: tcproute/default/tcproute-1
         tls:
           terminate:
@@ -288,6 +297,11 @@ xdsIR:
           closeDelay: 10s
           value: 3
       externalPort: 8080
+      metadata:
+        kind: Gateway
+        name: gateway-1
+        namespace: envoy-gateway
+        sectionName: tcp-1
       name: envoy-gateway/gateway-1/tcp-1
       port: 8080
       proxyProtocol: {}
@@ -310,6 +324,10 @@ xdsIR:
             name: tcproute/default/tcproute-1/rule/-1/backend/0
             protocol: TCP
             weight: 1
+        metadata:
+          kind: TCPRoute
+          name: tcproute-1
+          namespace: default
         name: tcproute/default/tcproute-1
       tcpKeepalive:
         idleTime: 1200

internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml

@@ -957,6 +957,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 8443
+      metadata:
+        kind: Gateway
+        name: gateway-1
+        namespace: default
+        sectionName: tcp-1
       name: default/gateway-1/tcp-1
       port: 8443
       tls:
@@ -969,6 +974,11 @@ xdsIR:
         minVersion: "1.2"
     - address: 0.0.0.0
       externalPort: 5000
+      metadata:
+        kind: Gateway
+        name: gateway-1
+        namespace: default
+        sectionName: tcp-2
       name: default/gateway-1/tcp-2
       port: 5000
       routes:
@@ -990,6 +1000,10 @@ xdsIR:
             name: tcproute/default/tcp-route-1/rule/-1/backend/0
             protocol: TCP
             weight: 1
+        metadata:
+          kind: TCPRoute
+          name: tcp-route-1
+          namespace: default
         name: tcproute/default/tcp-route-1
   default/gateway-2:
     accessLog:
@@ -1050,6 +1064,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 8443
+      metadata:
+        kind: Gateway
+        name: gateway-2
+        namespace: default
+        sectionName: tcp-1
       name: default/gateway-2/tcp-1
       port: 8443
       tls:
@@ -1062,6 +1081,11 @@ xdsIR:
         minVersion: "1.2"
     - address: 0.0.0.0
       externalPort: 5000
+      metadata:
+        kind: Gateway
+        name: gateway-2
+        namespace: default
+        sectionName: tcp-2
       name: default/gateway-2/tcp-2
       port: 5000
   default/gateway-3:
@@ -1133,6 +1157,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 8443
+      metadata:
+        kind: Gateway
+        name: gateway-3
+        namespace: default
+        sectionName: tcp-1
       name: default/gateway-3/tcp-1
       port: 8443
       tls:
@@ -1145,5 +1174,10 @@ xdsIR:
         minVersion: "1.2"
     - address: 0.0.0.0
       externalPort: 5000
+      metadata:
+        kind: Gateway
+        name: gateway-3
+        namespace: default
+        sectionName: tcp-2
       name: default/gateway-3/tcp-2
       port: 5000

internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml

@@ -640,6 +640,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 6443
+      metadata:
+        kind: Gateway
+        name: gateway-3
+        namespace: envoy-gateway
+        sectionName: tls-1
       name: envoy-gateway/gateway-3/tls-1
       port: 6443
       routes:
@@ -649,6 +654,10 @@ xdsIR:
             name: tcproute-1
             namespace: envoy-gateway
           name: tcproute/envoy-gateway/tcproute-1/rule/-1
+        metadata:
+          kind: TCPRoute
+          name: tcproute-1
+          namespace: envoy-gateway
         name: tcproute/envoy-gateway/tcproute-1
         tls:
           terminate:

internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml

@@ -300,6 +300,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 9090
+      metadata:
+        kind: Gateway
+        name: gateway-legacy-only
+        namespace: envoy-gateway
+        sectionName: tcp-1
       name: envoy-gateway/gateway-legacy-only/tcp-1
       port: 9090
       proxyProtocol: {}
@@ -310,6 +315,10 @@ xdsIR:
             name: tcproute-1
             namespace: envoy-gateway
           name: tcproute/envoy-gateway/tcproute-1/rule/-1
+        metadata:
+          kind: TCPRoute
+          name: tcproute-1
+          namespace: envoy-gateway
         name: tcproute/envoy-gateway/tcproute-1
   envoy-gateway/gateway-new-api-only:
     accessLog:

internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml

@@ -566,6 +566,11 @@ xdsIR:
     tcp:
     - address: 0.0.0.0
       externalPort: 53
+      metadata:
+        kind: Gateway
+        name: gateway-2
+        namespace: envoy-gateway
+        sectionName: tcp
       name: envoy-gateway/gateway-2/tcp
       port: 10053
   envoy-gateway/gateway-3: