forked from envoyproxy/gateway
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add missing http filters to the http filter chain (envoyproxy#2970)
* fix: add missing http filters to the http filter chain Signed-off-by: huabing zhao <[email protected]> * refactor Signed-off-by: huabing zhao <[email protected]> * fix lint Signed-off-by: huabing zhao <[email protected]> * add comments Signed-off-by: huabing zhao <[email protected]> * remove refactor Signed-off-by: huabing zhao <[email protected]> * remove refactor Signed-off-by: huabing zhao <[email protected]> * fix gen Signed-off-by: huabing zhao <[email protected]> * fix lint Signed-off-by: Huabing Zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> Signed-off-by: Huabing Zhao <[email protected]>
- Loading branch information
1 parent
245182b
commit 918daff
Showing
9 changed files
with
566 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
...ds/translator/testdata/in/xds-ir/multiple-listeners-same-port-with-different-filters.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| # This is a test file for multiple Gateway HTTP listeners on the same port with different filters. | ||
| # These HTTP listeners should be merged into a single HTTP connection manager, | ||
| # and the filters should be merged into the DefaultFilterChain of the HTTP connection manager. | ||
| http: | ||
| - name: default/gateway-1/http | ||
| address: 0.0.0.0 | ||
| hostnames: | ||
| - 'www.foo.com' | ||
| isHTTP2: false | ||
| http3: | ||
| quicPort: 443 | ||
| path: | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| mergeSlashes: true | ||
| port: 10080 | ||
| routes: | ||
| - name: httproute/default/httproute-1/rule/0/match/0/www_foo_com | ||
| hostname: www.foo.com | ||
| isHTTP2: false | ||
| pathMatch: | ||
| distinct: false | ||
| name: "" | ||
| prefix: /foo1 | ||
| backendWeights: | ||
| invalid: 0 | ||
| valid: 0 | ||
| destination: | ||
| name: httproute/default/httproute-1/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 192.168.1.1 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| weight: 1 | ||
| basicAuth: | ||
| name: securitypolicy/default/policy-for-http-route-1 | ||
| users: "dXNlcjE6e1NIQX10RVNzQm1FL3lOWTNsYjZhMEw2dlZRRVpOcXc9CnVzZXIyOntTSEF9RUo5TFBGRFhzTjl5blNtYnh2anA3NUJtbHg4PQo=" | ||
| - name: httproute/default/httproute-2/rule/0/match/0/www_foo_com | ||
| hostname: www.foo.com | ||
| isHTTP2: false | ||
| pathMatch: | ||
| distinct: false | ||
| name: "" | ||
| prefix: /foo2 | ||
| backendWeights: | ||
| invalid: 0 | ||
| valid: 0 | ||
| destination: | ||
| name: httproute/default/httproute-2/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 192.168.1.2 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| weight: 1 | ||
| extAuth: | ||
| name: securitypolicy/default/policy-for-http-route-2 | ||
| failOpen: true | ||
| http: | ||
| authority: http-backend.envoy-gateway:80 | ||
| destination: | ||
| name: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 7.7.7.7 | ||
| port: 80 | ||
| protocol: HTTP | ||
| weight: 1 | ||
| headersToBackend: | ||
| - header1 | ||
| - header2 | ||
| path: /auth | ||
| - name: default/gateway-2/http | ||
| address: 0.0.0.0 | ||
| hostnames: | ||
| - 'www.bar.com' | ||
| isHTTP2: false | ||
| path: | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| mergeSlashes: true | ||
| port: 10080 | ||
| routes: | ||
| - name: httproute/default/httproute-3/rule/0/match/0/www_bar_com | ||
| hostname: www.bar.com | ||
| isHTTP2: false | ||
| pathMatch: | ||
| distinct: false | ||
| name: "" | ||
| prefix: /bar | ||
| backendWeights: | ||
| invalid: 0 | ||
| valid: 0 | ||
| destination: | ||
| name: httproute/default/httproute-3/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 192.168.1.3 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| weight: 1 | ||
| oidc: | ||
| name: securitypolicy/default/policy-for-gateway-2 | ||
| clientID: client.oauth.foo.com | ||
| clientSecret: Y2xpZW50MTpzZWNyZXQK | ||
| provider: | ||
| authorizationEndpoint: https://oauth.foo.com/oauth2/v2/auth | ||
| tokenEndpoint: https://oauth.foo.com/token | ||
| scopes: | ||
| - openid | ||
| - profile | ||
| redirectURL: "https://www.example.com/foo/oauth2/callback" | ||
| redirectPath: "/foo/oauth2/callback" | ||
| logoutPath: "/foo/logout" | ||
| cookieSuffix: 5F93C2E4 |
104 changes: 104 additions & 0 deletions
104
...tor/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_ONLY | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/default/httproute-1/rule/0 | ||
| lbPolicy: LEAST_REQUEST | ||
| name: httproute/default/httproute-1/rule/0 | ||
| outlierDetection: {} | ||
| perConnectionBufferLimitBytes: 32768 | ||
| type: EDS | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_ONLY | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/default/httproute-2/rule/0 | ||
| lbPolicy: LEAST_REQUEST | ||
| name: httproute/default/httproute-2/rule/0 | ||
| outlierDetection: {} | ||
| perConnectionBufferLimitBytes: 32768 | ||
| type: EDS | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_ONLY | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend | ||
| lbPolicy: LEAST_REQUEST | ||
| name: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend | ||
| outlierDetection: {} | ||
| perConnectionBufferLimitBytes: 32768 | ||
| type: EDS | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_ONLY | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/default/httproute-3/rule/0 | ||
| lbPolicy: LEAST_REQUEST | ||
| name: httproute/default/httproute-3/rule/0 | ||
| outlierDetection: {} | ||
| perConnectionBufferLimitBytes: 32768 | ||
| type: EDS | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_ONLY | ||
| dnsRefreshRate: 30s | ||
| lbPolicy: LEAST_REQUEST | ||
| loadAssignment: | ||
| clusterName: oauth_foo_com_443 | ||
| endpoints: | ||
| - lbEndpoints: | ||
| - endpoint: | ||
| address: | ||
| socketAddress: | ||
| address: oauth.foo.com | ||
| portValue: 443 | ||
| loadBalancingWeight: 1 | ||
| loadBalancingWeight: 1 | ||
| locality: | ||
| region: oauth_foo_com_443/backend/0 | ||
| name: oauth_foo_com_443 | ||
| outlierDetection: {} | ||
| perConnectionBufferLimitBytes: 32768 | ||
| respectDnsTtl: true | ||
| transportSocket: | ||
| name: envoy.transport_sockets.tls | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: | ||
| validationContext: | ||
| trustedCa: | ||
| filename: /etc/ssl/certs/ca-certificates.crt | ||
| sni: oauth.foo.com | ||
| type: STRICT_DNS |
48 changes: 48 additions & 0 deletions
48
...or/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.endpoints.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| - clusterName: httproute/default/httproute-1/rule/0 | ||
| endpoints: | ||
| - lbEndpoints: | ||
| - endpoint: | ||
| address: | ||
| socketAddress: | ||
| address: 192.168.1.1 | ||
| portValue: 8080 | ||
| loadBalancingWeight: 1 | ||
| loadBalancingWeight: 1 | ||
| locality: | ||
| region: httproute/default/httproute-1/rule/0/backend/0 | ||
| - clusterName: httproute/default/httproute-2/rule/0 | ||
| endpoints: | ||
| - lbEndpoints: | ||
| - endpoint: | ||
| address: | ||
| socketAddress: | ||
| address: 192.168.1.2 | ||
| portValue: 8080 | ||
| loadBalancingWeight: 1 | ||
| loadBalancingWeight: 1 | ||
| locality: | ||
| region: httproute/default/httproute-2/rule/0/backend/0 | ||
| - clusterName: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend | ||
| endpoints: | ||
| - lbEndpoints: | ||
| - endpoint: | ||
| address: | ||
| socketAddress: | ||
| address: 7.7.7.7 | ||
| portValue: 80 | ||
| loadBalancingWeight: 1 | ||
| loadBalancingWeight: 1 | ||
| locality: | ||
| region: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend/backend/0 | ||
| - clusterName: httproute/default/httproute-3/rule/0 | ||
| endpoints: | ||
| - lbEndpoints: | ||
| - endpoint: | ||
| address: | ||
| socketAddress: | ||
| address: 192.168.1.3 | ||
| portValue: 8080 | ||
| loadBalancingWeight: 1 | ||
| loadBalancingWeight: 1 | ||
| locality: | ||
| region: httproute/default/httproute-3/rule/0/backend/0 |
Oops, something went wrong.