diff --git a/.changelog/21587.txt b/.changelog/21587.txt new file mode 100644 index 000000000000..f83db38c9500 --- /dev/null +++ b/.changelog/21587.txt @@ -0,0 +1,3 @@ +```release-note:improvement +Use Envoy's default for a route's validate_clusters option, which is false. This fixes a case where non-existent clusters could cause a route to no longer route to any of its backends, including existing ones. +``` diff --git a/agent/xds/routes.go b/agent/xds/routes.go index 41309b674e84..42d8f7732b7d 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -76,10 +76,6 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh route := &envoy_route_v3.RouteConfiguration{ Name: uid.EnvoyID(), VirtualHosts: []*envoy_route_v3.VirtualHost{virtualHost}, - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } resources = append(resources, route) } @@ -276,10 +272,6 @@ func (s *ResourceGenerator) routesForMeshGateway(cfgSnap *proxycfg.ConfigSnapsho route := &envoy_route_v3.RouteConfiguration{ Name: uid.EnvoyID(), VirtualHosts: []*envoy_route_v3.VirtualHost{virtualHost}, - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } resources = append(resources, route) } @@ -319,20 +311,12 @@ func makeNamedDefaultRouteWithLB(clusterName string, lb *structs.LoadBalancer, t }, }, }, - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), }, nil } func makeNamedAddressesRoute(routeName string, addresses map[string]string) (*envoy_route_v3.RouteConfiguration, error) { route := &envoy_route_v3.RouteConfiguration{ Name: routeName, - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } for clusterName, address := range addresses { action := makeRouteActionFromName(clusterName) @@ -371,10 +355,6 @@ func (s *ResourceGenerator) routesForIngressGateway(cfgSnap *proxycfg.ConfigSnap // don't have custom filter chains and routes to this. defaultRoute := &envoy_route_v3.RouteConfiguration{ Name: listenerKey.RouteName(), - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } for _, u := range upstreams { @@ -422,9 +402,8 @@ func (s *ResourceGenerator) routesForIngressGateway(cfgSnap *proxycfg.ConfigSnap defaultRoute.VirtualHosts = append(defaultRoute.VirtualHosts, virtualHost) } else { svcRoute := &envoy_route_v3.RouteConfiguration{ - Name: svcRouteName, - ValidateClusters: response.MakeBoolValue(true), - VirtualHosts: []*envoy_route_v3.VirtualHost{virtualHost}, + Name: svcRouteName, + VirtualHosts: []*envoy_route_v3.VirtualHost{virtualHost}, } result = append(result, svcRoute) } @@ -460,10 +439,6 @@ func (s *ResourceGenerator) routesForAPIGateway(cfgSnap *proxycfg.ConfigSnapshot listenerRoute := &envoy_route_v3.RouteConfiguration{ Name: readyListener.listenerKey.RouteName(), - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } // Consolidate all routes for this listener into the minimum possible set based on hostname matching. diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden index 192eed0b6cbe..3888c533f2c4 100644 --- a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden +++ b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -50,7 +48,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden index 5e25d5fdfafc..de8175e81e92 100644 --- a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden +++ b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden index 0f3440e32e34..f91d4715d1e6 100644 --- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden index 50acae3b21ab..29ba8ff7c2c1 100644 --- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden +++ b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden @@ -5,7 +5,6 @@ "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "mostSpecificHeaderMutationsWins": true, "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden index 095330c68404..1b9284c99175 100644 --- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden @@ -22,8 +22,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden index 3409e2f0dabc..92e5c9dfe078 100644 --- a/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden +++ b/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden index 9a3033d23816..282058fc7d7b 100644 --- a/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden +++ b/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden index ac6f2a1c2e8a..f404529d1a54 100644 --- a/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden +++ b/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden index 85dd47d9934e..6e9eb721b844 100644 --- a/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden +++ b/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden b/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden index b268a5e5ac5e..bd70cabf2edc 100644 --- a/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden +++ b/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden index 195aa3f77aeb..14558185b25f 100644 --- a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden b/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden index 6d9d5242037e..2ff828f4258b 100644 --- a/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden b/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden index 3ab67ba8f221..dd7498471dff 100644 --- a/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden index 486f8021b803..bb98b73d0e18 100644 --- a/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden index 5d8b1dd41e83..9acc0918c914 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden index 3f590b178ef3..3456b42bf8b9 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden index fe5c69a399dd..5ff17ff04705 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden index 9a73db46e0d6..5440895b8e3f 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden index 474ac19cd71b..5ba0bfe3484a 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden index 9a73db46e0d6..5440895b8e3f 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden index 9a73db46e0d6..5440895b8e3f 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 41c70e3de169..cdb43b252c31 100644 --- a/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden +++ b/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden index a15b997a8fd9..a461171d214e 100644 --- a/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden +++ b/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "443", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -45,7 +44,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden index 71f6e9893f60..53a49ce05ffb 100644 --- a/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden +++ b/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden index cb29b2bdabd1..413e4ac227cf 100644 --- a/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden +++ b/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "443", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden index d3a2ea221999..219dfac078e1 100644 --- a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden index 25fa94d0f3ab..4bf0ec2a3d20 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 ba8f0fa73d80..d0eca099f45b 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 @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden index 6d9c31be1c57..295bc827bfbe 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden index 25afe4ee6dac..f3ab8fee7ecd 100644 --- a/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden index a5fd13c15125..18c50d1c8931 100644 --- a/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden index a5fd13c15125..18c50d1c8931 100644 --- a/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden index a5fd13c15125..18c50d1c8931 100644 --- a/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden index de35eeddfdd7..96c1f714dadb 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080_s1", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden index 70dcd591060d..a7b6e583c4b5 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 cf218b1c9574..ddf8aed433bc 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 @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 350f1605f645..12dc9cc93c5a 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 @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden index 48d9d7b77443..358936f27028 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191_foo", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -29,7 +28,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191_web", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden index de35eeddfdd7..96c1f714dadb 100644 --- a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080_s1", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 8cd0610d70ea..590fd05c6226 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 @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -29,7 +28,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9191_web", - "validateClusters": true, "virtualHosts": [ { "domains": [ 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 be0cb1f2a4a5..a6edbbfca1f6 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 @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080_s1", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080_s2", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden index a5fd13c15125..18c50d1c8931 100644 --- a/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden index 8dd74e7de714..ed40b5faab02 100644 --- a/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8082", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -76,7 +73,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8083", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -100,7 +96,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8084", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden index a5fd13c15125..18c50d1c8931 100644 --- a/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden index 78f110c77036..866fc179e6f9 100644 --- a/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "9090", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden index 977c827264b2..f295797b3def 100644 --- a/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8082", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden index 977c827264b2..f295797b3def 100644 --- a/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8081", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8082", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden index 74385c310305..9f4796ed05a0 100644 --- a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden +++ b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden index 4737a59e3156..96bd040bf982 100644 --- a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden +++ b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "bar", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "foo", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -50,7 +48,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "gir", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden index 40722e65ce82..7684d14c97fa 100644 --- a/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden b/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden index f05a3fc60340..d30d528f000a 100644 --- a/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden +++ b/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -76,7 +73,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden index fa5dbf99a413..e0fae21af90f 100644 --- a/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden +++ b/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden index 39689dc5b2ea..33c3081ecffc 100644 --- a/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden +++ b/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -29,7 +28,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -54,7 +52,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden index 1e7cdde138fa..1115f38e8f54 100644 --- a/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden +++ b/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -48,7 +47,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -92,7 +90,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden index fa5dbf99a413..e0fae21af90f 100644 --- a/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden +++ b/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden index 0f3440e32e34..f91d4715d1e6 100644 --- a/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden +++ b/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden index 14ac8198ffbd..25897fa65ec1 100644 --- a/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden +++ b/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden index ba8f0fa73d80..d0eca099f45b 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "8080", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-mgw-peering.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-mgw-peering.latest.golden index 4737a59e3156..96bd040bf982 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-mgw-peering.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-mgw-peering.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "bar", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "foo", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -50,7 +48,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "gir", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden index 3f590b178ef3..3456b42bf8b9 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "db", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-term-gw.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-term-gw.latest.golden index fa5dbf99a413..e0fae21af90f 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-term-gw.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-term-gw.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -28,7 +27,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -52,7 +50,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden index 0f3440e32e34..f91d4715d1e6 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden @@ -4,7 +4,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ @@ -27,7 +26,6 @@ { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "name": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "validateClusters": true, "virtualHosts": [ { "domains": [ diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go index c2cd4e6e504f..ac1ec14594c9 100644 --- a/agent/xds/xds_protocol_helpers_test.go +++ b/agent/xds/xds_protocol_helpers_test.go @@ -798,8 +798,7 @@ func makeTestRoute(t *testing.T, fixtureName string) *envoy_route_v3.RouteConfig switch fixtureName { case "http2:db", "http:db": return &envoy_route_v3.RouteConfiguration{ - Name: "db", - ValidateClusters: response.MakeBoolValue(true), + Name: "db", VirtualHosts: []*envoy_route_v3.VirtualHost{ { Name: "db", diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go index d2b106f3b675..90de1b0cb936 100644 --- a/agent/xdsv2/route_resources.go +++ b/agent/xdsv2/route_resources.go @@ -35,10 +35,6 @@ func (pr *ProxyResources) makeEnvoyRoute(name string) (*envoy_route_v3.RouteConf func (pr *ProxyResources) makeEnvoyRouteConfigFromProxystateRoute(name string, psRoute *pbproxystate.Route) *envoy_route_v3.RouteConfiguration { envoyRouteConfig := &envoy_route_v3.RouteConfiguration{ Name: name, - // ValidateClusters defaults to true when defined statically and false - // when done via RDS. Re-set the reasonable value of true to prevent - // null-routing traffic. - ValidateClusters: response.MakeBoolValue(true), } for _, vh := range psRoute.GetVirtualHosts() { diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-bar.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-bar.golden index 0f219c7321e0..258acc5be1b8 100644 --- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-bar.golden @@ -58,8 +58,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden index 01c1151dd987..8b81dfe58e50 100644 --- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-default-default.golden @@ -58,8 +58,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-bar.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-bar.golden index 2a5dfa6d98bf..f496774ab096 100644 --- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-bar.golden @@ -58,8 +58,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-default.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-default.golden index 2013c631abe1..f6b0d792d673 100644 --- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-default.golden +++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination-foo-default.golden @@ -58,8 +58,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden index 966ba941811c..cbc19abec0ab 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] }, { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", @@ -44,8 +43,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden index 36b5a1dc96b3..344c55a5486a 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] }, { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", @@ -44,8 +43,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden index c506d6f03f4e..711493e27b3c 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] }, { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", @@ -44,8 +43,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden index c768c7787d93..c9d3543867d8 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] }, { "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", @@ -44,8 +43,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden index c8c28c439564..a941adbdd6b4 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden index b9dfecfe0358..d35ec34d7e41 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden index e10da7d0ee5a..9f6e9f785fb9 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden index 9196875e82fd..f241c36db525 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden index c8c28c439564..a941adbdd6b4 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden index b9dfecfe0358..d35ec34d7e41 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden index e10da7d0ee5a..9f6e9f785fb9 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden index 9196875e82fd..f241c36db525 100644 --- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden +++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden @@ -21,8 +21,7 @@ } ] } - ], - "validateClusters": true + ] } ], "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",