Skip to content

feat: support ir metadata to tcproute/udproute #6815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zirain merged 2 commits into from
Sep 15, 2025
Merged

feat: support ir metadata to tcproute/udproute #6815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4543c37
feat: support ir metadata to tcproute/udproute
kkk777-7 Aug 18, 2025
9c66a4b
Merge branch 'main' into support-ir-metadata-xroute
arkodg Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/gatewayapi/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},

Expand All @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions internal/gatewayapi/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,8 @@ func (t *Translator) processUDPRouteParentRefs(udpRoute *UDPRouteContext, resour
Destination: &ir.RouteDestination{
Name: destName,
Settings: destSettings,
Metadata: buildResourceMetadata(udpRoute, nil),
// udpRoute Must have a single rule, so can use index 0.
Metadata: buildResourceMetadata(udpRoute, udpRoute.Spec.Rules[0].Name),
},
}
irListener.Route = irRoute
Expand Down Expand Up @@ -1310,7 +1311,8 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
Destination: &ir.RouteDestination{
Name: destName,
Settings: destSettings,
Metadata: buildResourceMetadata(tcpRoute, nil),
// tcpRoute Must have a single rule, so can use index 0.
Metadata: buildResourceMetadata(tcpRoute, tcpRoute.Spec.Rules[0].Name),
},
}

Expand Down
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions ...gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -328,6 +333,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:
Expand Down
10 changes: 10 additions & 0 deletions ...l/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -401,6 +406,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:
Expand Down
10 changes: 10 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -288,6 +293,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: {}
Expand Down
30 changes: 30 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-invalid-settings.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -1050,6 +1060,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:
Expand All @@ -1062,6 +1077,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:
Expand Down Expand Up @@ -1133,6 +1153,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:
Expand All @@ -1145,5 +1170,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
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol-legacy-mixed.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 445
metadata:
kind: Gateway
name: gateway-tls
namespace: envoy-gateway
name: envoy-gateway/gateway-tls/
port: 10445
routes:
Expand Down
4 changes: 4 additions & 0 deletions internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 445
metadata:
kind: Gateway
name: gateway-tls
namespace: envoy-gateway
name: envoy-gateway/gateway-tls/
port: 10445
routes:
Expand Down
4 changes: 4 additions & 0 deletions internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 445
metadata:
kind: Gateway
name: gateway-tls
namespace: envoy-gateway
name: envoy-gateway/gateway-tls/
port: 10445
routes:
Expand Down
10 changes: 10 additions & 0 deletions internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ xdsIR:
type: Accepted
controllerName: gateway.envoyproxy.io/gatewayclass-controller
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp1
name: envoy-gateway/gateway-1/tcp1
port: 10080
- address: 0.0.0.0
Expand Down Expand Up @@ -283,5 +288,10 @@ xdsIR:
type: Accepted
controllerName: gateway.envoyproxy.io/gatewayclass-controller
externalPort: 81
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp2
name: envoy-gateway/gateway-1/tcp2
port: 10081
10 changes: 10 additions & 0 deletions internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ xdsIR:
type: Accepted
controllerName: gateway.envoyproxy.io/gatewayclass-controller
externalPort: 162
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: udp1
name: envoy-gateway/gateway-1/udp1
port: 10162
- address: 0.0.0.0
Expand Down Expand Up @@ -283,5 +288,10 @@ xdsIR:
type: Accepted
controllerName: gateway.envoyproxy.io/gatewayclass-controller
externalPort: 163
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: udp2
name: envoy-gateway/gateway-1/udp2
port: 10163
5 changes: 5 additions & 0 deletions internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,10 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp
name: envoy-gateway/gateway-1/tcp
port: 10080
5 changes: 5 additions & 0 deletions ...ewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 162
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp
name: envoy-gateway/gateway-1/tcp
port: 10162
routes:
Expand Down
5 changes: 5 additions & 0 deletions ...l/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp
name: envoy-gateway/gateway-1/tcp
port: 10080
routes:
Expand Down
5 changes: 5 additions & 0 deletions ...rnal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,10 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tcp
name: envoy-gateway/gateway-1/tcp
port: 10080
5 changes: 5 additions & 0 deletions ...nal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ xdsIR:
tcp:
- address: 0.0.0.0
externalPort: 90
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: tls-passthrough
name: envoy-gateway/gateway-1/tls-passthrough
port: 10090
routes:
Expand Down
5 changes: 5 additions & 0 deletions ...ewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ xdsIR:
udp:
- address: 0.0.0.0
externalPort: 162
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: udp
name: envoy-gateway/gateway-1/udp
port: 10162
route:
Expand Down
5 changes: 5 additions & 0 deletions ...l/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ xdsIR:
udp:
- address: 0.0.0.0
externalPort: 80
metadata:
kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: udp
name: envoy-gateway/gateway-1/udp
port: 10080
route:
Expand Down
Loading