Skip to content

sort httpFilters on name if priority order is same #6600

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
arkodg merged 3 commits into from
Jul 29, 2025
Merged

sort httpFilters on name if priority order is same #6600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
391b320
sort httpFilters on name if priority order is same
Jul 25, 2025
b984234
fix make gen-check
Jul 26, 2025
3f47ecf
comment
Jul 28, 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
6 changes: 3 additions & 3 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 @@ -1213,14 +1213,14 @@ xds:
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.grpc_stats
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
emitFilterState: true
statsForAllMethods: true
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
12 changes: 6 additions & 6 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 @@ -1089,12 +1089,6 @@
"maxConcurrentStreams": 100
},
"httpFilters": [
{
"name": "envoy.filters.http.grpc_web",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb"
}
},
{
"name": "envoy.filters.http.grpc_stats",
"typedConfig": {
Expand All @@ -1103,6 +1097,12 @@
"statsForAllMethods": true
}
},
{
"name": "envoy.filters.http.grpc_web",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb"
}
},
{
"name": "envoy.filters.http.router",
"typedConfig": {
Expand Down
6 changes: 3 additions & 3 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 @@ -666,14 +666,14 @@ xds:
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.grpc_stats
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
emitFilterState: true
statsForAllMethods: true
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
6 changes: 3 additions & 3 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 @@ -230,14 +230,14 @@ xds:
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.grpc_stats
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
emitFilterState: true
statsForAllMethods: true
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
9 changes: 9 additions & 0 deletions internal/xds/translator/httpfilters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ func (o OrderedHTTPFilters) Len() int {
}

func (o OrderedHTTPFilters) Less(i, j int) bool {
// Sort on name if the order is equal
// to keep the order stable and avoiding
// listener drains
if o[i].order == o[j].order {
return o[i].filter.Name < o[j].filter.Name
}

// Sort on order
return o[i].order < o[j].order
}

Expand All @@ -171,6 +179,7 @@ func sortHTTPFilters(filters []*hcmv3.HttpFilter, filterOrder []egv1a1.FilterPos
for i := 0; i < len(filters); i++ {
orderedFilters[i] = newOrderedHTTPFilter(filters[i])
}

sort.Sort(orderedFilters)

// Use a linked list to sort the filters in the custom order.
Expand Down
12 changes: 6 additions & 6 deletions internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-http-route-1
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-gateway-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth
forwardUsernameHeader: x-username
forwardUsernameHeader: x-user-id
users:
inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=
inlineBytes: Zm9vOntTSEF9WXMyM0FnLzVJT1dxWkN3OVFHYVZEZEh3SDAwPQpmb28xOntTSEF9ZGpaMTFxSFkwS09pamV5bUs3YUt2WXV2aHZNPQo=
- disabled: true
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-gateway-1
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth
forwardUsernameHeader: x-user-id
forwardUsernameHeader: x-username
users:
inlineBytes: Zm9vOntTSEF9WXMyM0FnLzVJT1dxWkN3OVFHYVZEZEh3SDAwPQpmb28xOntTSEF9ZGpaMTFxSFkwS09pamV5bUs3YUt2WXV2aHZNPQo=
inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
8 changes: 4 additions & 4 deletions internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-http-route-1
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-gateway-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth
users:
inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=
inlineBytes: Zm9vOntTSEF9WXMyM0FnLzVJT1dxWkN3OVFHYVZEZEh3SDAwPQpmb28xOntTSEF9ZGpaMTFxSFkwS09pamV5bUs3YUt2WXV2aHZNPQo=
- disabled: true
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-gateway-1
name: envoy.filters.http.basic_auth/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.basic_auth.v3.BasicAuth
users:
inlineBytes: Zm9vOntTSEF9WXMyM0FnLzVJT1dxWkN3OVFHYVZEZEh3SDAwPQpmb28xOntTSEF9ZGpaMTFxSFkwS09pamV5bUs3YUt2WXV2aHZNPQo=
inlineBytes: dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
6 changes: 3 additions & 3 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 @@ -138,14 +138,14 @@
transportApiVersion: V3
withRequestBody:
maxRequestBytes: 8192
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.grpc_stats
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
emitFilterState: true
statsForAllMethods: true
- name: envoy.filters.http.grpc_web
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- disabled: true
name: envoy.filters.http.ext_proc/envoyextensionpolicy/default/policy-for-httproute/extproc/0
typedConfig:
Expand Down
32 changes: 16 additions & 16 deletions internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,6 @@
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-gateway-1
typedConfig:
Expand All @@ -49,6 +33,22 @@
timeout: 10s
uri: http://primary.foo.com/auth
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
32 changes: 16 additions & 16 deletions internal/xds/translator/testdata/out/xds-ir/ext-auth-body.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,6 @@
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-gateway-1
typedConfig:
Expand All @@ -51,6 +35,22 @@
transportApiVersion: V3
withRequestBody:
maxRequestBytes: 32768
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
32 changes: 16 additions & 16 deletions internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,6 @@
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-gateway-1
typedConfig:
Expand All @@ -50,6 +34,22 @@
timeout: 10s
uri: http://primary.foo.com/auth
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: primary.foo.com
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
32 changes: 16 additions & 16 deletions internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,6 @@
initialStreamWindowSize: 65536
maxConcurrentStreams: 100
httpFilters:
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: grpc-backend.default:9000
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-gateway-1
typedConfig:
Expand All @@ -49,6 +33,22 @@
timeout: 10s
uri: http://http-backend.envoy-gateway:80/auth
transportApiVersion: V3
- disabled: true
name: envoy.filters.http.ext_authz/securitypolicy/default/policy-for-http-route-1
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
allowedHeaders:
patterns:
- exact: header1
ignoreCase: true
- exact: header2
ignoreCase: true
grpcService:
envoyGrpc:
authority: grpc-backend.default:9000
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
timeout: 10s
transportApiVersion: V3
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
Expand Down
Loading
Loading