From f23a80c3e086ed8b00e760d14fd8bb98ab696c93 Mon Sep 17 00:00:00 2001 From: Blake Covarrubias Date: Tue, 11 Jul 2023 19:38:23 +0000 Subject: [PATCH 1/3] backport of commit 60cbdd569c11b302f3ab7c1014858c28ade8ef31 --- agent/xds/listeners.go | 4 ++++ agent/xds/xds_protocol_helpers_test.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index cf5ae6b56778..18566ea0f34c 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -2203,6 +2203,10 @@ func makeHTTPFilter(opts listenerFilterOpts) (*envoy_listener_v3.Filter, error) // sampled. RandomSampling: &envoy_type_v3.Percent{Value: 0.0}, }, + // Explicitly enable WebSocket upgrades for all HTTP listeners + UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{ + {UpgradeType: "websocket"}, + }, } if opts.tracing != nil { diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go index 8b04f30a0c2c..87ced2800a25 100644 --- a/agent/xds/xds_protocol_helpers_test.go +++ b/agent/xds/xds_protocol_helpers_test.go @@ -677,6 +677,9 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s Tracing: &envoy_http_v3.HttpConnectionManager_Tracing{ RandomSampling: &envoy_type_v3.Percent{Value: 0}, }, + UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{ + {UpgradeType: "websocket"}, + }, Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{}, }), }, @@ -705,6 +708,9 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s Tracing: &envoy_http_v3.HttpConnectionManager_Tracing{ RandomSampling: &envoy_type_v3.Percent{Value: 0}, }, + UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{ + {UpgradeType: "websocket"}, + }, Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{}, }), }, @@ -733,6 +739,9 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s Tracing: &envoy_http_v3.HttpConnectionManager_Tracing{ RandomSampling: &envoy_type_v3.Percent{Value: 0}, }, + UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{ + {UpgradeType: "websocket"}, + }, // HttpProtocolOptions: &envoy_core_v3.Http1ProtocolOptions{}, }), }, From 653fe8d9b29ab6f5ba5fabafe9747d1a8bcb0cd6 Mon Sep 17 00:00:00 2001 From: Blake Covarrubias Date: Sat, 15 Jul 2023 00:06:36 +0000 Subject: [PATCH 2/3] backport of commit 642c1459b67a8939882c02a8c2a9bd7b4cbf8a2e --- .changelog/18150.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/18150.txt diff --git a/.changelog/18150.txt b/.changelog/18150.txt new file mode 100644 index 000000000000..492e7ad1b9ff --- /dev/null +++ b/.changelog/18150.txt @@ -0,0 +1,3 @@ +```release-note:improvement +xds: Explicitly enable WebSocket connection upgrades in HTTP connection manager +``` From b81ac04805f974e57ed62c18f640c9e64a522858 Mon Sep 17 00:00:00 2001 From: Blake Covarrubias Date: Thu, 20 Jul 2023 14:21:14 -0700 Subject: [PATCH 3/3] Update golden files --- .../custom-passive-healthcheck.latest.golden | 4 +- ...oxy-with-chain-and-overrides.latest.golden | 7 ++- ...onnect-proxy-with-grpc-chain.latest.golden | 7 ++- ...onnect-proxy-with-http-chain.latest.golden | 7 ++- ...nnect-proxy-with-http2-chain.latest.golden | 7 ++- .../custom-trace-listener.latest.golden | 7 ++- .../listeners/expose-checks.latest.golden | 7 ++- ...expose-paths-local-app-paths.latest.golden | 14 ++++- ...pose-paths-new-cluster-http2.latest.golden | 14 ++++- .../grpc-public-listener.latest.golden | 7 ++- .../http-listener-with-timeouts.latest.golden | 7 ++- ...http-public-listener-no-xfcc.latest.golden | 7 ++- .../http-public-listener.latest.golden | 7 ++- .../listeners/http-upstream.latest.golden | 7 ++- .../http2-public-listener.latest.golden | 7 ++- ...gress-grpc-multiple-services.latest.golden | 7 ++- ...gress-http-multiple-services.latest.golden | 14 ++++- ...itter-with-resolver-redirect.latest.golden | 7 ++- ...ith-grpc-single-tls-listener.latest.golden | 14 ++++- ...d-grpc-multiple-tls-listener.latest.golden | 14 ++++- ...th-http2-single-tls-listener.latest.golden | 14 ++++- ...h-sds-listener+service-level.latest.golden | 14 ++++- ...h-sds-listener-gw-level-http.latest.golden | 7 ++- ...s-service-level-mixed-no-tls.latest.golden | 14 ++++- ...gress-with-sds-service-level.latest.golden | 14 ++++- ...ess-with-single-tls-listener.latest.golden | 14 ++++- ...n-listeners-gateway-defaults.latest.golden | 35 ++++++++++-- ...ess-with-tls-mixed-listeners.latest.golden | 14 ++++- ...-mixed-min-version-listeners.latest.golden | 21 ++++++- ...ed-services-http-with-router.latest.golden | 7 ++- ...xported-peered-services-http.latest.golden | 21 ++++++- ...itter-with-resolver-redirect.latest.golden | 7 ++- ...ting-gateway-service-subsets.latest.golden | 21 ++++++- ...arent-proxy-destination-http.latest.golden | 14 ++++- ...nsparent-proxy-http-upstream.latest.golden | 7 ++- ...ng-gateway-destinations-only.latest.golden | 14 ++++- ...and-failover-to-cluster-peer.latest.golden | 32 +++++------ ...and-redirect-to-cluster-peer.latest.golden | 32 +++++------ ...roxy-with-chain-external-sni.latest.golden | 32 +++++------ .../connect-proxy-with-chain.latest.golden | 32 +++++------ ...gress-grpc-multiple-services.latest.golden | 48 ++++++++-------- ...ngress-with-chain-and-router.latest.golden | 2 +- ...-sds-listener-level-wildcard.latest.golden | 48 ++++++++-------- ...ress-with-sds-listener-level.latest.golden | 48 ++++++++-------- ...-sds-service-level-mixed-tls.latest.golden | 56 +++++++++---------- ...gress-with-sds-service-level.latest.golden | 56 +++++++++---------- ...-connect-proxy-opposite-meta.latest.golden | 5 ++ .../lambda-connect-proxy.latest.golden | 5 ++ ...teway-with-service-resolvers.latest.golden | 15 +++++ .../lambda-terminating-gateway.latest.golden | 5 ++ 50 files changed, 573 insertions(+), 253 deletions(-) diff --git a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden index e00633358e57..696645d6d590 100644 --- a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden +++ b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden @@ -21,9 +21,9 @@ "outlierDetection": { "consecutive5xx": 5, "interval": "10s", - "enforcingConsecutive5xx": 80, + "baseEjectionTime": "10s", "maxEjectionPercent": 100, - "baseEjectionTime": "10s" + "enforcingConsecutive5xx": 80 }, "commonLbConfig": { "healthyPanicThreshold": { diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden index 4e524021f8b2..33a5019b0fa2 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden @@ -55,7 +55,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden index 4e524021f8b2..33a5019b0fa2 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden @@ -55,7 +55,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden index 0eed52477d62..dd425356f85f 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden index 56d9ffd88151..03a25880fe38 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden @@ -42,7 +42,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden index 95c1aa63c63c..0a5304d02b51 100644 --- a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden +++ b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden @@ -139,7 +139,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/expose-checks.latest.golden b/agent/xds/testdata/listeners/expose-checks.latest.golden index 518285040d05..ad9266723a74 100644 --- a/agent/xds/testdata/listeners/expose-checks.latest.golden +++ b/agent/xds/testdata/listeners/expose-checks.latest.golden @@ -67,7 +67,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden index cb7b0d46e7db..2acbe64b60e8 100644 --- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden +++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden @@ -51,7 +51,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -109,7 +114,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden index 84ef190ad931..b2957d3f5562 100644 --- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden +++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden @@ -54,7 +54,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -112,7 +117,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/grpc-public-listener.latest.golden b/agent/xds/testdata/listeners/grpc-public-listener.latest.golden index 04493913f9cd..8b291b42c607 100644 --- a/agent/xds/testdata/listeners/grpc-public-listener.latest.golden +++ b/agent/xds/testdata/listeners/grpc-public-listener.latest.golden @@ -134,7 +134,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden index a3c58e2ab848..e1dc747eb575 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden @@ -120,7 +120,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden index 2ba00f2cecd0..bb8b4f747ac2 100644 --- a/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden +++ b/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden @@ -110,7 +110,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/http-public-listener.latest.golden b/agent/xds/testdata/listeners/http-public-listener.latest.golden index c7a70d337137..f0a4a7494d59 100644 --- a/agent/xds/testdata/listeners/http-public-listener.latest.golden +++ b/agent/xds/testdata/listeners/http-public-listener.latest.golden @@ -118,7 +118,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/http-upstream.latest.golden b/agent/xds/testdata/listeners/http-upstream.latest.golden index 717877fcd732..e58350173666 100644 --- a/agent/xds/testdata/listeners/http-upstream.latest.golden +++ b/agent/xds/testdata/listeners/http-upstream.latest.golden @@ -51,7 +51,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/http2-public-listener.latest.golden b/agent/xds/testdata/listeners/http2-public-listener.latest.golden index cf6f0150aa37..afb44f601130 100644 --- a/agent/xds/testdata/listeners/http2-public-listener.latest.golden +++ b/agent/xds/testdata/listeners/http2-public-listener.latest.golden @@ -121,7 +121,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden index abad991957b5..051c66746dee 100644 --- a/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden +++ b/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden @@ -55,7 +55,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden index bcdf29c64326..dc8ab53ad886 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -85,7 +90,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden index ae2f68556e15..c149b6e64551 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden index e4a769066ad7..aae651f30320 100644 --- a/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden @@ -55,7 +55,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -117,7 +122,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden index 774d0defabb4..588ea9a910e9 100644 --- a/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden @@ -55,7 +55,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -135,7 +140,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden index 03bc6bc63399..b9e0d16bc2c5 100644 --- a/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden @@ -42,7 +42,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -91,7 +96,12 @@ }, "http2ProtocolOptions": { - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden index 7aa0d5d210a9..62b0c7adbffe 100644 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden @@ -44,7 +44,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -112,7 +117,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden index de06deebade4..01e9ce4f2f56 100644 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden index 3faaddb8a2cc..068d508fd6c0 100644 --- a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden @@ -44,7 +44,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -112,7 +117,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden index c2ee37ccb197..7278995791cc 100644 --- a/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden @@ -44,7 +44,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -117,7 +122,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden index 22edaf577d14..13495a35033c 100644 --- a/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -85,7 +90,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden index 7eac1ef3d6a7..90cafd66ece4 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -115,7 +120,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -191,7 +201,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -267,7 +282,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -343,7 +363,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden index 8e7894f8d3a5..9db6913ad3b7 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -115,7 +120,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden index 802f47f4df36..72b33de8c15c 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -115,7 +120,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -191,7 +201,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden index 1ed34afb91e5..cedfc71f1264 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden @@ -52,7 +52,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden index acb312116d12..44593a662b83 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden @@ -52,7 +52,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -142,7 +147,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -232,7 +242,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden index 0eed52477d62..dd425356f85f 100644 --- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden @@ -39,7 +39,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden index 003860ddcd76..dfdf59732e9b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden @@ -223,7 +223,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -305,7 +310,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -387,7 +397,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden index b621f19ddc80..1ccd72610362 100644 --- a/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden +++ b/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden @@ -67,7 +67,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] @@ -103,7 +108,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden index 7c4a0a622101..a4e64fe0d764 100644 --- a/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden +++ b/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden @@ -88,7 +88,12 @@ "randomSampling": { } - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ] diff --git a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden index a56501250ef3..174ebef13332 100644 --- a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden +++ b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden @@ -115,7 +115,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], @@ -413,7 +418,12 @@ "chain": true, "dns": true, "uri": true - } + }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ] } } ], diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden index 095330c68404..e7b89f29f3e5 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden @@ -1,31 +1,31 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "db", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "db", + "virtualHosts": [ { - "name": "db", - "domains": [ + "name": "db", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "33s" + "route": { + "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "33s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden index cf29d6729a0a..e53fdbb0c974 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden @@ -1,31 +1,31 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "db", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "db", + "virtualHosts": [ { - "name": "db", - "domains": [ + "name": "db", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "db.default.cluster-01.external.peer1.domain", - "timeout": "33s" + "route": { + "cluster": "db.default.cluster-01.external.peer1.domain", + "timeout": "33s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden index 095330c68404..e7b89f29f3e5 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden @@ -1,31 +1,31 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "db", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "db", + "virtualHosts": [ { - "name": "db", - "domains": [ + "name": "db", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "33s" + "route": { + "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "33s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden index 095330c68404..e7b89f29f3e5 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden @@ -1,31 +1,31 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "db", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "db", + "virtualHosts": [ { - "name": "db", - "domains": [ + "name": "db", + "domains": [ "*" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "33s" + "route": { + "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "33s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden index 006bf5157b08..8b491a9a834e 100644 --- a/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden +++ b/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden @@ -1,52 +1,52 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "8080", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "8080", + "virtualHosts": [ { - "name": "foo", - "domains": [ + "name": "foo", + "domains": [ "test1.example.com", "test2.example.com", "test2.example.com:8080", "test1.example.com:8080" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] }, { - "name": "bar", - "domains": [ + "name": "bar", + "domains": [ "bar.ingress.*", "bar.ingress.*:8080" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden index 17c660358460..ffe7313996f1 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden @@ -275,7 +275,7 @@ "timeout": "33s" } }, - { + { "match": { "prefix": "/idle-timeout" }, diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden index cedfc99f6550..a57278624966 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden @@ -1,50 +1,50 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191", + "virtualHosts": [ { - "name": "web", - "domains": [ + "name": "web", + "domains": [ "web.ingress.*", "web.ingress.*:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] }, { - "name": "foo", - "domains": [ + "name": "foo", + "domains": [ "foo.ingress.*", "foo.ingress.*:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden index 3f2631217daf..6b252346f821 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden @@ -1,50 +1,50 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191", + "virtualHosts": [ { - "name": "web", - "domains": [ + "name": "web", + "domains": [ "www.example.com", "www.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] }, { - "name": "foo", - "domains": [ + "name": "foo", + "domains": [ "foo.example.com", "foo.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden index 7539ad4feb1a..cdf471da5279 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden @@ -1,57 +1,57 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191", + "virtualHosts": [ { - "name": "foo", - "domains": [ + "name": "foo", + "domains": [ "foo.example.com", "foo.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true }, { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191_web", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191_web", + "virtualHosts": [ { - "name": "web", - "domains": [ + "name": "web", + "domains": [ "www.example.com", "www.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden index 6009fac72314..8f3d543d6b70 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden @@ -1,57 +1,57 @@ { - "versionInfo": "00000001", - "resources": [ + "versionInfo": "00000001", + "resources": [ { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191_foo", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191_foo", + "virtualHosts": [ { - "name": "foo", - "domains": [ + "name": "foo", + "domains": [ "foo.example.com", "foo.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true }, { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "9191_web", - "virtualHosts": [ + "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "name": "9191_web", + "virtualHosts": [ { - "name": "web", - "domains": [ + "name": "web", + "domains": [ "www.example.com", "www.example.com:9191" ], - "routes": [ + "routes": [ { - "match": { - "prefix": "/" + "match": { + "prefix": "/" }, - "route": { - "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "timeout": "22s" + "route": { + "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", + "timeout": "22s" } } ] } ], - "validateClusters": true + "validateClusters": true } ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" + "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", + "nonce": "00000001" } \ No newline at end of file diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy-opposite-meta.latest.golden index e37af5aa16d0..58b6b30b7ae2 100644 --- a/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy-opposite-meta.latest.golden +++ b/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy-opposite-meta.latest.golden @@ -60,6 +60,11 @@ } }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } } diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy.latest.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy.latest.golden index 8dd8a34a8729..c2474ed64b45 100644 --- a/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy.latest.golden +++ b/agent/xds/testdata/serverless_plugin/listeners/lambda-connect-proxy.latest.golden @@ -60,6 +60,11 @@ } }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } } diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden index 59000983e22e..972070279498 100644 --- a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden +++ b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden @@ -178,6 +178,11 @@ "dns": true, "uri": true }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } } @@ -269,6 +274,11 @@ "dns": true, "uri": true }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } } @@ -414,6 +424,11 @@ "dns": true, "uri": true }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } } diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden index 732272c3cb3c..87a3e6511ac8 100644 --- a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden +++ b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden @@ -232,6 +232,11 @@ "dns": true, "uri": true }, + "upgradeConfigs": [ + { + "upgradeType": "websocket" + } + ], "stripAnyHostPort": true } }