Skip to content

feat: add listener metadata #6639

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
zhaohuabing merged 5 commits into from
Aug 2, 2025
Merged

feat: add listener metadata #6639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41919ab
add listener metadata
zhaohuabing Jul 30, 2025
abf4a14
Merge branch 'main' into listener-metadata
zhaohuabing Jul 31, 2025
2e69065
remove sort
zhaohuabing Aug 1, 2025
de8735f
Merge remote-tracking branch 'origin/main' into listener-metadata
zhaohuabing Aug 1, 2025
c294487
Merge branch 'main' into listener-metadata
zirain Aug 2, 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
16 changes: 16 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,14 @@ xds:
useRemoteAddress: true
name: default/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: http
name: default/eg/http
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down Expand Up @@ -1239,6 +1247,14 @@ xds:
useRemoteAddress: true
name: default/eg/grpc
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: grpc
name: default/eg/grpc
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down
28 changes: 28 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,20 @@
"name": "default/eg/http"
},
"maxConnectionsToAcceptPerSocketEvent": 1,
"metadata": {
"filterMetadata": {
"envoy-gateway": {
"resources": [
{
"kind": "Gateway",
"name": "eg",
"namespace": "default",
"sectionName": "http"
}
]
}
}
},
"name": "default/eg/http",
"perConnectionBufferLimitBytes": 32768
}
Expand Down Expand Up @@ -1130,6 +1144,20 @@
"name": "default/eg/grpc"
},
"maxConnectionsToAcceptPerSocketEvent": 1,
"metadata": {
"filterMetadata": {
"envoy-gateway": {
"resources": [
{
"kind": "Gateway",
"name": "eg",
"namespace": "default",
"sectionName": "grpc"
}
]
}
}
},
"name": "default/eg/grpc",
"perConnectionBufferLimitBytes": 32768
}
Expand Down
16 changes: 16 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,14 @@ xds:
useRemoteAddress: true
name: default/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: http
name: default/eg/http
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down Expand Up @@ -692,6 +700,14 @@ xds:
useRemoteAddress: true
name: default/eg/grpc
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: grpc
name: default/eg/grpc
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down
16 changes: 16 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ xds:
useRemoteAddress: true
name: default/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: http
name: default/eg/http
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down Expand Up @@ -255,6 +263,14 @@ xds:
useRemoteAddress: true
name: default/eg/grpc
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: default
sectionName: grpc
name: default/eg/grpc
perConnectionBufferLimitBytes: 32768
- activeState:
Expand Down
14 changes: 14 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,20 @@
"name": "envoy-gateway-system/eg/http"
},
"maxConnectionsToAcceptPerSocketEvent": 1,
"metadata": {
"filterMetadata": {
"envoy-gateway": {
"resources": [
{
"kind": "Gateway",
"name": "eg",
"namespace": "envoy-gateway-system",
"sectionName": "http"
}
]
}
}
},
"name": "envoy-gateway-system/eg/http",
"perConnectionBufferLimitBytes": 32768
}
Expand Down
8 changes: 8 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,14 @@ xds:
useRemoteAddress: true
name: envoy-gateway-system/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: envoy-gateway-system
sectionName: http
name: envoy-gateway-system/eg/http
perConnectionBufferLimitBytes: 32768
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
Expand Down
8 changes: 8 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,13 @@ xds:
useRemoteAddress: true
name: envoy-gateway-system/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: envoy-gateway-system
sectionName: http
name: envoy-gateway-system/eg/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ xds:
useRemoteAddress: true
name: envoy-gateway-system/eg/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: eg
namespace: envoy-gateway-system
sectionName: http
name: envoy-gateway-system/eg/http
perConnectionBufferLimitBytes: 32768
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
Expand Down
17 changes: 16 additions & 1 deletion internal/xds/translator/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,23 @@ func buildXdsMetadata(metadata *ir.ResourceMetadata) *corev3.Metadata {
return nil
}

return buildXdsMetadataFromMultiple([]*ir.ResourceMetadata{metadata})
}

func buildXdsMetadataFromMultiple(metadata []*ir.ResourceMetadata) *corev3.Metadata {
if metadata == nil {
return nil
}

resourcesList := &structpb.ListValue{}
resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(metadata))
for _, md := range metadata {
if md != nil {
resourcesList.Values = append(resourcesList.Values, buildResourceMetadata(md))
}
}
if len(resourcesList.Values) == 0 {
return nil
}

return &corev3.Metadata{
FilterMetadata: map[string]*structpb.Struct{
Expand Down
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,5 +345,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,13 @@
useRemoteAddress: true
name: default/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: default
sectionName: http
name: default/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/btp-telemetry.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/compression.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions ...nal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/credential-injection.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,13 @@
useRemoteAddress: true
name: default/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: default
sectionName: http
name: default/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,13 @@
useRemoteAddress: true
name: default/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: default
sectionName: http
name: default/gateway-1/http
perConnectionBufferLimitBytes: 32768
8 changes: 8 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,13 @@
useRemoteAddress: true
name: envoy-gateway/gateway-1/http
maxConnectionsToAcceptPerSocketEvent: 1
metadata:
filterMetadata:
envoy-gateway:
resources:
- kind: Gateway
name: gateway-1
namespace: envoy-gateway
sectionName: http
name: envoy-gateway/gateway-1/http
perConnectionBufferLimitBytes: 32768
Loading