From 1dccf00259c861c8dd04043ebd68e4e8394c352a Mon Sep 17 00:00:00 2001 From: Jesse Haka Date: Fri, 23 Feb 2024 12:53:01 +0200 Subject: [PATCH] fix testdata Signed-off-by: Jesse Haka --- .../translate/out/default-resources.all.yaml | 6 ++++-- .../translate/out/envoy-patch-policy.all.yaml | 2 -- .../out/from-gateway-api-to-xds.all.json | 19 ++++++++++++------- .../out/from-gateway-api-to-xds.all.yaml | 6 ++++-- .../out/from-gateway-api-to-xds.listener.yaml | 2 -- .../out/from-gateway-api-to-xds.route.yaml | 4 ++++ ...-single-route-single-match-to-xds.all.json | 12 ++++++------ ...-single-route-single-match-to-xds.all.yaml | 4 ++-- ...le-route-single-match-to-xds.listener.yaml | 2 -- ...ingle-route-single-match-to-xds.route.yaml | 2 ++ .../translate/out/multiple-xds.route.json | 14 ++++++++++++-- .../translate/out/quickstart.route.yaml | 2 ++ internal/xds/translator/route.go | 2 ++ ...http-route-extension-filter.listeners.yaml | 2 -- .../http-route-extension-filter.routes.yaml | 2 ++ .../http-route.listeners.yaml | 2 -- .../extension-xds-ir/http-route.routes.yaml | 2 ++ .../out/xds-ir/accesslog.listeners.yaml | 2 -- .../out/xds-ir/basic-auth.listeners.yaml | 2 -- .../out/xds-ir/basic-auth.routes.yaml | 2 ++ .../out/xds-ir/circuit-breaker.listeners.yaml | 2 -- .../out/xds-ir/circuit-breaker.routes.yaml | 2 ++ .../xds-ir/client-ip-detection.listeners.yaml | 6 ------ .../xds-ir/client-ip-detection.routes.yaml | 6 ++++++ .../out/xds-ir/client-timeout.listeners.yaml | 2 -- .../out/xds-ir/client-timeout.routes.yaml | 2 ++ .../testdata/out/xds-ir/cors.listeners.yaml | 2 -- .../testdata/out/xds-ir/cors.routes.yaml | 2 ++ .../out/xds-ir/ext-auth.listeners.yaml | 2 -- .../testdata/out/xds-ir/ext-auth.routes.yaml | 4 ++++ .../out/xds-ir/fault-injection.listeners.yaml | 2 -- .../out/xds-ir/fault-injection.routes.yaml | 10 ++++++++++ .../out/xds-ir/health-check.listeners.yaml | 2 -- .../out/xds-ir/health-check.routes.yaml | 8 ++++++++ .../http-route-direct-response.listeners.yaml | 2 -- .../http-route-dns-cluster.listeners.yaml | 2 -- .../xds-ir/http-route-dns-cluster.routes.yaml | 2 ++ .../xds-ir/http-route-mirror.listeners.yaml | 2 -- .../out/xds-ir/http-route-mirror.routes.yaml | 2 ++ ...http-route-multiple-matches.listeners.yaml | 2 -- .../http-route-multiple-matches.routes.yaml | 14 ++++++++++++++ ...http-route-multiple-mirrors.listeners.yaml | 2 -- .../http-route-multiple-mirrors.routes.yaml | 2 ++ .../http-route-partial-invalid.listeners.yaml | 2 -- .../http-route-partial-invalid.routes.yaml | 4 ++++ .../xds-ir/http-route-redirect.listeners.yaml | 2 -- .../xds-ir/http-route-regex.listeners.yaml | 2 -- .../out/xds-ir/http-route-regex.routes.yaml | 2 ++ .../http-route-request-headers.listeners.yaml | 2 -- .../http-route-request-headers.routes.yaml | 2 ++ ...-route-response-add-headers.listeners.yaml | 2 -- ...ttp-route-response-add-headers.routes.yaml | 2 ++ ...response-add-remove-headers.listeners.yaml | 2 -- ...te-response-add-remove-headers.routes.yaml | 2 ++ ...ute-response-remove-headers.listeners.yaml | 2 -- ...-route-response-remove-headers.routes.yaml | 2 ++ ...ewrite-root-path-url-prefix.listeners.yaml | 2 -- ...-route-rewrite-url-fullpath.listeners.yaml | 2 -- ...http-route-rewrite-url-host.listeners.yaml | 2 -- ...tp-route-rewrite-url-prefix.listeners.yaml | 2 -- .../xds-ir/http-route-timeout.listeners.yaml | 2 -- .../out/xds-ir/http-route-timeout.routes.yaml | 2 ++ ...http-route-weighted-backend.listeners.yaml | 2 -- .../http-route-weighted-backend.routes.yaml | 2 ++ ...te-weighted-invalid-backend.listeners.yaml | 2 -- ...route-weighted-invalid-backend.routes.yaml | 2 ++ .../out/xds-ir/http-route.listeners.yaml | 2 -- .../out/xds-ir/http-route.routes.yaml | 2 ++ .../xds-ir/http1-preserve-case.listeners.yaml | 4 ---- .../xds-ir/http1-preserve-case.routes.yaml | 4 ++++ .../out/xds-ir/http1-trailers.listeners.yaml | 2 -- .../out/xds-ir/http1-trailers.routes.yaml | 2 ++ .../testdata/out/xds-ir/http10.listeners.yaml | 2 -- .../testdata/out/xds-ir/http10.routes.yaml | 2 ++ .../out/xds-ir/http2-route.routes.yaml | 2 ++ .../testdata/out/xds-ir/http3.listeners.yaml | 4 ---- .../testdata/out/xds-ir/http3.routes.yaml | 2 ++ ...npatch-add-op-without-value.listeners.yaml | 2 -- ...jsonpatch-add-op-without-value.routes.yaml | 2 ++ ...atch-invalid-patch.envoypatchpolicies.yaml | 4 ++-- .../jsonpatch-invalid-patch.listeners.yaml | 2 -- .../jsonpatch-invalid-patch.routes.yaml | 2 ++ .../jsonpatch-missing-resource.listeners.yaml | 2 -- .../jsonpatch-missing-resource.routes.yaml | 2 ++ ...sonpatch-move-op-with-value.listeners.yaml | 2 -- .../jsonpatch-move-op-with-value.routes.yaml | 2 ++ .../out/xds-ir/jsonpatch.listeners.yaml | 2 -- .../testdata/out/xds-ir/jsonpatch.routes.yaml | 2 ++ .../jwt-custom-extractor.listeners.yaml | 2 -- .../xds-ir/jwt-custom-extractor.routes.yaml | 2 ++ ...-multi-route-multi-provider.listeners.yaml | 2 -- ...jwt-multi-route-multi-provider.routes.yaml | 4 ++++ ...multi-route-single-provider.listeners.yaml | 2 -- ...wt-multi-route-single-provider.routes.yaml | 4 ++++ .../out/xds-ir/jwt-ratelimit.listeners.yaml | 2 -- .../out/xds-ir/jwt-ratelimit.routes.yaml | 6 ++++++ ...t-single-route-single-match.listeners.yaml | 2 -- .../jwt-single-route-single-match.routes.yaml | 2 ++ .../listener-proxy-protocol.listeners.yaml | 2 -- .../listener-proxy-protocol.routes.yaml | 2 ++ .../listener-tcp-keepalive.listeners.yaml | 4 ---- .../xds-ir/listener-tcp-keepalive.routes.yaml | 4 ++++ .../out/xds-ir/load-balancer.listeners.yaml | 2 -- .../out/xds-ir/load-balancer.routes.yaml | 12 ++++++++++++ .../out/xds-ir/local-ratelimit.listeners.yaml | 2 -- .../out/xds-ir/local-ratelimit.routes.yaml | 6 ++++++ .../metrics-virtual-host.listeners.yaml | 2 -- .../xds-ir/metrics-virtual-host.routes.yaml | 2 ++ ...ultiple-listeners-same-port.listeners.yaml | 6 ------ .../multiple-listeners-same-port.routes.yaml | 8 ++++++++ .../out/xds-ir/mutual-tls.listeners.yaml | 2 -- .../out/xds-ir/mutual-tls.routes.yaml | 2 ++ .../testdata/out/xds-ir/oidc.listeners.yaml | 2 -- .../testdata/out/xds-ir/oidc.routes.yaml | 4 ++++ .../out/xds-ir/path-settings.listeners.yaml | 2 -- .../out/xds-ir/path-settings.routes.yaml | 2 ++ .../proxy-protocol-upstream.listeners.yaml | 2 -- .../proxy-protocol-upstream.routes.yaml | 2 ++ .../ratelimit-custom-domain.listeners.yaml | 2 -- .../ratelimit-custom-domain.routes.yaml | 6 ++++++ .../xds-ir/ratelimit-sourceip.listeners.yaml | 2 -- .../out/xds-ir/ratelimit-sourceip.routes.yaml | 8 ++++++++ .../out/xds-ir/ratelimit.listeners.yaml | 2 -- .../testdata/out/xds-ir/ratelimit.routes.yaml | 6 ++++++ .../retry-partial-invalid.listeners.yaml | 2 -- .../xds-ir/retry-partial-invalid.routes.yaml | 4 ++++ .../out/xds-ir/simple-tls.listeners.yaml | 2 -- .../out/xds-ir/simple-tls.routes.yaml | 2 ++ .../suppress-envoy-headers.listeners.yaml | 2 -- .../xds-ir/suppress-envoy-headers.routes.yaml | 2 ++ .../out/xds-ir/timeout.listeners.yaml | 2 -- .../testdata/out/xds-ir/timeout.routes.yaml | 2 ++ ...-with-ciphers-versions-alpn.listeners.yaml | 2 -- ...tls-with-ciphers-versions-alpn.routes.yaml | 2 ++ .../out/xds-ir/tracing.listeners.yaml | 2 -- .../upstream-tcpkeepalive.listeners.yaml | 2 -- .../xds-ir/upstream-tcpkeepalive.routes.yaml | 2 ++ 137 files changed, 252 insertions(+), 173 deletions(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 92a71a6ac1cd..22e3efd7589f 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -814,8 +814,6 @@ xds: routeConfigName: default/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: default/eg/http perConnectionBufferLimitBytes: 32768 @@ -1027,6 +1025,8 @@ xds: name: httproute/default/backend/rule/0/match/0/www_example_com route: cluster: httproute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true @@ -1041,3 +1041,5 @@ xds: name: grpcroute/default/backend/rule/0/match/0/www_grpc-example_com route: cluster: grpcroute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml b/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml index c31c5d146f32..757ae8d4c92d 100644 --- a/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml @@ -210,8 +210,6 @@ xds: routeConfigName: default/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: default/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index bd7a401d9572..4d512f4ee8b7 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -570,11 +570,6 @@ }, "serverHeaderTransformation": "PASS_THROUGH", "statPrefix": "http", - "upgradeConfigs": [ - { - "upgradeType": "websocket" - } - ], "useRemoteAddress": true } } @@ -923,7 +918,12 @@ }, "name": "httproute/default/backend/rule/0/match/0/www_example_com", "route": { - "cluster": "httproute/default/backend/rule/0" + "cluster": "httproute/default/backend/rule/0", + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -949,7 +949,12 @@ }, "name": "grpcroute/default/backend/rule/0/match/0/www_grpc-example_com", "route": { - "cluster": "grpcroute/default/backend/rule/0" + "cluster": "grpcroute/default/backend/rule/0", + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index ed5c71ea6024..c74ea23ba1e0 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -340,8 +340,6 @@ xds: routeConfigName: default/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: default/eg/http perConnectionBufferLimitBytes: 32768 @@ -553,6 +551,8 @@ xds: name: httproute/default/backend/rule/0/match/0/www_example_com route: cluster: httproute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true @@ -567,3 +567,5 @@ xds: name: grpcroute/default/backend/rule/0/match/0/www_grpc-example_com route: cluster: grpcroute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index bc904a54906d..cdc209005927 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -57,8 +57,6 @@ xds: routeConfigName: default/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: default/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml index 318efe2352f9..462e5086e8c3 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml @@ -16,6 +16,8 @@ xds: name: httproute/default/backend/rule/0/match/0/www_example_com route: cluster: httproute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket - routeConfig: '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration ignorePortInHostMatching: true @@ -30,3 +32,5 @@ xds: name: grpcroute/default/backend/rule/0/match/0/www_grpc-example_com route: cluster: grpcroute/default/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index c776a2f53b3d..f560e26e3569 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -447,11 +447,6 @@ }, "serverHeaderTransformation": "PASS_THROUGH", "statPrefix": "http", - "upgradeConfigs": [ - { - "upgradeType": "websocket" - } - ], "useRemoteAddress": true } } @@ -485,7 +480,12 @@ }, "name": "httproute/envoy-gateway-system/backend/rule/0/match/0/www_example_com", "route": { - "cluster": "httproute/envoy-gateway-system/backend/rule/0" + "cluster": "httproute/envoy-gateway-system/backend/rule/0", + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] }, "typedPerFilterConfig": { "envoy.filters.http.jwt_authn": { diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 94acbe319049..cf16f74c30c4 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -267,8 +267,6 @@ xds: routeConfigName: envoy-gateway-system/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 @@ -288,6 +286,8 @@ xds: name: httproute/envoy-gateway-system/backend/rule/0/match/0/www_example_com route: cluster: httproute/envoy-gateway-system/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index acc9e8afdee5..5ee4e32724b1 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -74,8 +74,6 @@ xds: routeConfigName: envoy-gateway-system/eg/http serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: envoy-gateway-system/eg/http perConnectionBufferLimitBytes: 32768 diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.route.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.route.yaml index 476fb3e582e9..a02553f10081 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.route.yaml @@ -16,6 +16,8 @@ xds: name: httproute/envoy-gateway-system/backend/rule/0/match/0/www_example_com route: cluster: httproute/envoy-gateway-system/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json b/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json index c2d43139edda..b311b7118393 100644 --- a/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json +++ b/internal/cmd/egctl/testdata/translate/out/multiple-xds.route.json @@ -21,7 +21,12 @@ }, "name": "httproute/default/backend/rule/0/match/0/www_example_com", "route": { - "cluster": "httproute/default/backend/rule/0" + "cluster": "httproute/default/backend/rule/0", + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -52,7 +57,12 @@ }, "name": "httproute/default/backend/rule/0/match/0/www_example2_com", "route": { - "cluster": "httproute/default/backend/rule/0" + "cluster": "httproute/default/backend/rule/0", + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml index 12104d66b085..f358d4066ef6 100644 --- a/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/quickstart.route.yaml @@ -16,3 +16,5 @@ xds: name: httproute/envoy-gateway-system/backend/rule/0/match/0/www_example_com route: cluster: httproute/envoy-gateway-system/backend/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go index abfb0c77165a..6e8cb5d817ec 100644 --- a/internal/xds/translator/route.go +++ b/internal/xds/translator/route.go @@ -68,6 +68,8 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute) (*routev3.Route, error) { routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirrors) } } + // Allow websocket upgrades for HTTP 1.1 + // Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Protocol_upgrade_mechanism routeAction.UpgradeConfigs = []*routev3.RouteAction_UpgradeConfig{ { UpgradeType: "websocket", diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index c5835215d896..78de85eaf853 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: extension-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: extension-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml index 243339164de3..b259daf0c76b 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.routes.yaml @@ -29,3 +29,5 @@ value: foo.example.io/v1alpha1 route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml index 738eb0a2d2aa..7030f6f4cd7d 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.routes.yaml @@ -21,3 +21,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index a3bf0b5bc886..b686e3e3ba56 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -138,8 +138,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index 11ecc856c2db..43ae33619b36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -34,8 +34,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml index 6fdefbdf7c16..f87be11474a8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.basic_auth_first-route: '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index 102b968f145b..4a7a9d7b2d1b 100755 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -26,8 +26,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true xffNumTrustedHops: 2 name: first-listener @@ -66,8 +64,6 @@ routeConfigName: second-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: false name: second-listener perConnectionBufferLimitBytes: 32768 @@ -107,8 +103,6 @@ routeConfigName: third-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: false name: third-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml index 724f80699c7d..12a38a14ef88 100755 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: second-listener virtualHosts: @@ -22,6 +24,8 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: third-listener virtualHosts: @@ -34,3 +38,5 @@ name: third-route route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index e6e99e720bf1..5c15af1329f2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -29,8 +29,6 @@ requestTimeout: 5s serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index b9858e6777a0..f5269c85d610 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml index fc0fdea378e2..f776257868c0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.cors: '@type': type.googleapis.com/envoy.extensions.filters.http.cors.v3.CorsPolicy diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index ec6f73b212ff..39e40d86862c 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -55,8 +55,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml index d8aae14302af..0b039af3da3b 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.routes.yaml @@ -10,6 +10,8 @@ name: httproute/default/httproute-1/rule/0/match/0/www_example_com route: cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.ext_authz_httproute/default/httproute-1/rule/0/match/0/www_example_com: '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig @@ -19,6 +21,8 @@ name: httproute/default/httproute-2/rule/0/match/0/www_example_com route: cluster: httproute/default/httproute-2/rule/0 + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.ext_authz_httproute/default/httproute-2/rule/0/match/0/www_example_com: '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 7586adc78b07..17eedce3c8e4 100755 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml index bed4a696e0a1..1f093f5a0c24 100755 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.fault: '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault @@ -23,6 +25,8 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.fault: '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault @@ -36,6 +40,8 @@ name: third-route route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.fault: '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault @@ -54,6 +60,8 @@ name: fourth-route route: cluster: fourth-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.fault: '@type': type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault @@ -72,3 +80,5 @@ name: fifth-route route: cluster: fifth-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml index 79c66f882040..de4249178e46 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.routes.yaml @@ -10,18 +10,26 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: third-route route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: fourth-route route: cluster: fourth-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml index 7b23a59dfeeb..c27e2ea57790 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.routes.yaml @@ -14,3 +14,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml index c5f6e70b2546..c5a187d2c266 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.routes.yaml @@ -10,3 +10,5 @@ name: mirror-route route: cluster: route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml index 2db7970b38af..25584aa3a911 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.routes.yaml @@ -14,11 +14,15 @@ name: envoy-gateway/httproute-2/rule/0/match/0/example.com route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - match: pathSeparatedPrefix: /v1/example name: envoy-gateway/httproute-3/rule/0/match/0/example.com route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket - domains: - example.net name: first-listener/example_net @@ -32,11 +36,15 @@ name: envoy-gateway/httproute-4/rule/0/match/0/example.net route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket - match: pathSeparatedPrefix: /v1/status name: envoy-gateway/httproute-5/rule/0/match/0/example.net route: cluster: fourth-route-dest + upgradeConfigs: + - upgradeType: websocket - domains: - '*.com' name: first-listener/*_com @@ -46,6 +54,8 @@ name: envoy-gateway/httproute-1/rule/0/match/0/*.com route: cluster: fifth-route-dest + upgradeConfigs: + - upgradeType: websocket - domains: - '*.net' name: first-listener/*_net @@ -55,6 +65,8 @@ name: envoy-gateway/httproute-1/rule/0/match/0/*.net route: cluster: sixth-route-dest + upgradeConfigs: + - upgradeType: websocket - domains: - '*' name: first-listener/* @@ -64,3 +76,5 @@ name: envoy-gateway/httproute-1/rule/0/match/0/* route: cluster: seventh-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml index 1429b4da64e7..f46cc50eb529 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.routes.yaml @@ -13,3 +13,5 @@ requestMirrorPolicies: - cluster: mirror-route-dest - cluster: mirror-route-dest1 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml index ac7c41d98468..61face5a3a36 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.routes.yaml @@ -21,6 +21,8 @@ name: valid-route route: cluster: valid-route-dest + upgradeConfigs: + - upgradeType: websocket - match: headers: - name: user @@ -37,3 +39,5 @@ name: invalid-route route: cluster: invalid-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml index a3c115b6da97..7bc7d162a85c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.routes.yaml @@ -21,3 +21,5 @@ name: regex-route route: cluster: regex-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml index 3ded1e7105d3..f91a70cb2ee7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.routes.yaml @@ -32,3 +32,5 @@ - some-header6 route: cluster: request-header-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml index a57c32ff84ad..b2241a1181c2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.routes.yaml @@ -29,3 +29,5 @@ keepEmptyValue: true route: cluster: response-header-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml index f8c7a7ff5bb0..b09594aecda2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.routes.yaml @@ -32,3 +32,5 @@ - some-header6 route: cluster: response-header-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml index 4052f973e28a..58a4e272090a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.routes.yaml @@ -13,3 +13,5 @@ - some-header6 route: cluster: response-header-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml index 52a166770bc4..db3dbd4ba6a1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.routes.yaml @@ -15,3 +15,5 @@ route: cluster: first-route-dest timeout: 5s + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml index 5b56c04dbae1..235dea427290 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: clusterNotFoundResponseCode: INTERNAL_SERVER_ERROR + upgradeConfigs: + - upgradeType: websocket weightedClusters: clusters: - name: invalid-backend-cluster diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml index 738eb0a2d2aa..7030f6f4cd7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.routes.yaml @@ -21,3 +21,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index 51679103175f..97027d4ddd3d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -34,8 +34,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 @@ -76,8 +74,6 @@ routeConfigName: second-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml index d36b9824e31c..ff93cfff360b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: second-listener virtualHosts: @@ -22,3 +24,5 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index 59592df658ab..deeec73ee856 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -30,8 +30,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index cb4e1c75776f..4833fb5d95db 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml index 59831c3176d3..a32852fcd881 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.routes.yaml @@ -18,3 +18,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index 5c05193ce62c..b702b2028caa 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: envoy-gateway/gateway-1/tls serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.quic @@ -81,8 +79,6 @@ routeConfigName: envoy-gateway/gateway-1/tls serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml index d129cf7589d9..0680b361d153 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.routes.yaml @@ -15,3 +15,5 @@ value: h3=":10443"; ma=86400 route: cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.listeners.yaml index d0e88f02b413..cc9cac0f374c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.listeners.yaml @@ -39,8 +39,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.routes.yaml index dc48be196468..4a412b3576a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-add-op-without-value.routes.yaml @@ -14,3 +14,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.envoypatchpolicies.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.envoypatchpolicies.yaml index 8d9f6918bd1e..b56bc6e6ec72 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.envoypatchpolicies.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.envoypatchpolicies.yaml @@ -3,8 +3,8 @@ status: conditions: - lastTransitionTime: null - message: 'unable to unmarshal xds resource {"name":"first-listener","address":{"socket_address":{"address":"0.0.0.0","port_value":10080}},"default_filter_chain":{"filters":[{"name":"envoy.filters.network.http_connection_manager","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","stat_prefix":"http","rds":{"config_source":{"ads":{},"resource_api_version":"V3"},"route_config_name":"first-listener"},"http_filters":[{"name":"envoy.filters.http.router","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router","suppress_envoy_headers":true}}],"common_http_protocol_options":{"headers_with_underscores_action":"REJECT_REQUEST"},"http2_protocol_options":{"max_concurrent_streams":100,"initial_stream_window_size":65536,"initial_connection_window_size":1048576},"server_header_transformation":"PASS_THROUGH","use_remote_address":true,"upgrade_configs":[{"upgrade_type":"websocket"}],"normalize_path":true,"merge_slashes":true,"path_with_escaped_slashes_action":"UNESCAPE_AND_REDIRECT"}}]},"per_connection_buffer_limit_bytes":32768,"this":{"path":{"never":{"existed":{"name":"envoy.filters.http.ratelimit","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit","domain":"eg-ratelimit","failure_mode_deny":true,"rate_limit_service":{"grpc_service":{"envoy_grpc":{"cluster_name":"rate-limit-cluster"}},"transport_api_version":"V3"},"timeout":"1s"}}}}}}, - err:proto: (line 1:1099): unknown field "this"' + message: 'unable to unmarshal xds resource {"name":"first-listener","address":{"socket_address":{"address":"0.0.0.0","port_value":10080}},"default_filter_chain":{"filters":[{"name":"envoy.filters.network.http_connection_manager","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","stat_prefix":"http","rds":{"config_source":{"ads":{},"resource_api_version":"V3"},"route_config_name":"first-listener"},"http_filters":[{"name":"envoy.filters.http.router","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router","suppress_envoy_headers":true}}],"common_http_protocol_options":{"headers_with_underscores_action":"REJECT_REQUEST"},"http2_protocol_options":{"max_concurrent_streams":100,"initial_stream_window_size":65536,"initial_connection_window_size":1048576},"server_header_transformation":"PASS_THROUGH","use_remote_address":true,"normalize_path":true,"merge_slashes":true,"path_with_escaped_slashes_action":"UNESCAPE_AND_REDIRECT"}}]},"per_connection_buffer_limit_bytes":32768,"this":{"path":{"never":{"existed":{"name":"envoy.filters.http.ratelimit","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit","domain":"eg-ratelimit","failure_mode_deny":true,"rate_limit_service":{"grpc_service":{"envoy_grpc":{"cluster_name":"rate-limit-cluster"}},"transport_api_version":"V3"},"timeout":"1s"}}}}}}, + err:proto: (line 1:1050): unknown field "this"' reason: Invalid status: "False" type: Programmed diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.routes.yaml index dc48be196468..4a412b3576a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-invalid-patch.routes.yaml @@ -14,3 +14,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml index dc48be196468..4a412b3576a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.routes.yaml @@ -14,3 +14,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.listeners.yaml index d0e88f02b413..cc9cac0f374c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.listeners.yaml @@ -39,8 +39,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.routes.yaml index dc48be196468..4a412b3576a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-move-op-with-value.routes.yaml @@ -14,3 +14,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index d0e88f02b413..cc9cac0f374c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -39,8 +39,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml index fae73436c2f5..3f4a7333a605 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.routes.yaml @@ -17,3 +17,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index b8a88fd79378..dd56da6385e0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -56,8 +56,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml index c73bec09093d..321ecc1ced2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index df761c63a077..2fe288a18ea1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -112,8 +112,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml index 630157c4b40e..5cd81b5d475c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.routes.yaml @@ -10,6 +10,8 @@ name: first-route-www.test.com route: cluster: first-route-www.test.com-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig @@ -19,6 +21,8 @@ name: second-route-www.test.com route: cluster: second-route-www.test.com-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index e16c2673208b..696a3a7cd8fc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -90,8 +90,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml index 2078809a6948..7c52b6de16d9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig @@ -19,6 +21,8 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index 72c2f332e637..ead9542a53c1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -59,8 +59,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml index 019897bf021d..0e312fd928c0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.routes.yaml @@ -23,6 +23,8 @@ - name: x-user-id stringMatch: exact: one + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig @@ -40,6 +42,8 @@ - requestHeaders: descriptorKey: rule-0-match-0 headerName: x-user-id + upgradeConfigs: + - upgradeType: websocket - match: path: test name: third-route @@ -53,3 +57,5 @@ - genericKey: descriptorKey: rule-0-match--1 descriptorValue: rule-0-match--1 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index 945509a05224..a25e8b6b7c9b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -49,8 +49,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml index c73bec09093d..321ecc1ced2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.jwt_authn: '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index 4df723a03072..b6beea79e4b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 203f36be5a5b..5acf269fa9a6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 @@ -68,8 +66,6 @@ routeConfigName: second-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: second-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml index d36b9824e31c..ff93cfff360b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: second-listener virtualHosts: @@ -22,3 +24,5 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml index d2a33c648492..49db596538b0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml @@ -10,16 +10,22 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: third-route route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: fourth-route @@ -28,13 +34,19 @@ hashPolicy: - connectionProperties: sourceIp: true + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: fifth-route route: cluster: fifth-route-dest + upgradeConfigs: + - upgradeType: websocket - match: prefix: / name: sixth-route route: cluster: sixth-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index 3841aa65768a..afa59059ebdf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -32,8 +32,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml index 3f28acd5a153..9b5dd3f7d03e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.routes.yaml @@ -28,6 +28,8 @@ - name: x-org-id stringMatch: exact: foo + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.local_ratelimit: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit @@ -95,6 +97,8 @@ exact: bar - maskedRemoteAddress: v4PrefixMaskLen: 16 + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.local_ratelimit: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit @@ -136,6 +140,8 @@ name: third-route-ratelimit-no-rule route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.local_ratelimit: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml index 0d2cb8567b8d..41594a227db0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket virtualClusters: - headers: - name: :authority diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 102fe74e0704..848a62deab39 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: third-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true filterChains: - filterChainMatch: @@ -60,8 +58,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls @@ -104,8 +100,6 @@ routeConfigName: second-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml index cd8f24c1194b..c94d2c09f700 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: second-listener virtualHosts: @@ -22,6 +24,8 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket - ignorePortInHostMatching: true name: third-listener virtualHosts: @@ -34,6 +38,8 @@ name: third-route route: cluster: third-route-dest + upgradeConfigs: + - upgradeType: websocket - domains: - '*' name: fourth-listener/* @@ -43,3 +49,5 @@ name: fourth-route route: cluster: fourth-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index 4726fb8aa0e8..f0a783d1225d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index 8173e9f9e29b..e2ed7593b718 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -110,8 +110,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml index f4ba1044899d..a093d6967ac9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.routes.yaml @@ -10,6 +10,8 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.oauth2_first-route: '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig @@ -19,6 +21,8 @@ name: second-route route: cluster: second-route-dest + upgradeConfigs: + - upgradeType: websocket typedPerFilterConfig: envoy.filters.http.oauth2_second-route: '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index 88def256e956..3396e1ded63c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -27,8 +27,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index be0d4a05bfd0..def74e6c3aaa 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -38,8 +38,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml index 8146d71a2263..479c2cd143c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.routes.yaml @@ -23,6 +23,8 @@ - name: x-user-id stringMatch: exact: one + upgradeConfigs: + - upgradeType: websocket - match: path: example name: second-route @@ -36,6 +38,8 @@ - requestHeaders: descriptorKey: rule-0-match-0 headerName: x-user-id + upgradeConfigs: + - upgradeType: websocket - match: path: test name: third-route @@ -49,3 +53,5 @@ - genericKey: descriptorKey: rule-0-match--1 descriptorValue: rule-0-match--1 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index be0d4a05bfd0..def74e6c3aaa 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -38,8 +38,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml index cb60f39a5dba..a82f9d5c4591 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.routes.yaml @@ -17,6 +17,8 @@ descriptorValue: first-route - maskedRemoteAddress: v4PrefixMaskLen: 16 + upgradeConfigs: + - upgradeType: websocket - match: path: example name: second-route @@ -29,6 +31,8 @@ descriptorValue: second-route - maskedRemoteAddress: v4PrefixMaskLen: 24 + upgradeConfigs: + - upgradeType: websocket - match: path: test name: third-route @@ -42,6 +46,8 @@ - genericKey: descriptorKey: rule-0-match--1 descriptorValue: rule-0-match--1 + upgradeConfigs: + - upgradeType: websocket - match: path: distinct name: fourth-route @@ -55,3 +61,5 @@ - maskedRemoteAddress: v4PrefixMaskLen: 16 - remoteAddress: {} + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index be0d4a05bfd0..def74e6c3aaa 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -38,8 +38,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml index 8146d71a2263..479c2cd143c7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.routes.yaml @@ -23,6 +23,8 @@ - name: x-user-id stringMatch: exact: one + upgradeConfigs: + - upgradeType: websocket - match: path: example name: second-route @@ -36,6 +38,8 @@ - requestHeaders: descriptorKey: rule-0-match-0 headerName: x-user-id + upgradeConfigs: + - upgradeType: websocket - match: path: test name: third-route @@ -49,3 +53,5 @@ - genericKey: descriptorKey: rule-0-match--1 descriptorValue: rule-0-match--1 + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml index e71f0c41be5c..e1b4ffe7bf1d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.routes.yaml @@ -20,6 +20,8 @@ baseInterval: 0.100s maxInterval: 10s retryOn: connect-failure,retriable-status-codes + upgradeConfigs: + - upgradeType: websocket - domains: - foo name: first-listener/foo @@ -34,6 +36,8 @@ retriableStatusCodes: - 503 retryOn: connect-failure,refused-stream,unavailable,cancelled,retriable-status-codes + upgradeConfigs: + - upgradeType: websocket - domains: - bar name: first-listener/bar diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 3fd6384f903e..469471fbbe99 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index 9c68dc1ab546..7857a5110d95 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -30,8 +30,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index a404ab4d9f62..002b05c25de2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -31,8 +31,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: https - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true transportSocket: name: envoy.transport_sockets.tls diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index e27bb6fec3a1..4932ef2516f2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -56,8 +56,6 @@ serviceName: fake-name.fake-ns randomSampling: value: 90 - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index 046589e0fd89..e9224a23bd53 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -28,8 +28,6 @@ routeConfigName: first-listener serverHeaderTransformation: PASS_THROUGH statPrefix: http - upgradeConfigs: - - upgradeType: websocket useRemoteAddress: true name: first-listener perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml index 2734c7cc42a0..0b5b4bee7bbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.routes.yaml @@ -10,3 +10,5 @@ name: first-route route: cluster: first-route-dest + upgradeConfigs: + - upgradeType: websocket