From def66ddf0ea0790c54ab449064de3c4f1f42875d Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Thu, 19 Oct 2023 14:14:16 -0700 Subject: [PATCH] mesh: provide missing domain to route configurations in ProxyStateTemplate (#19298) * add empty domains * update unit tests --- .../sidecarproxy/builder/destinations.go | 2 ++ .../destination/mixed-multi-destination.golden | 3 +++ ...l7-multiple-implicit-destinations-tproxy.golden | 6 ++++++ ...nd-l7-single-implicit-destination-tproxy.golden | 3 +++ ...stination-with-multiple-workloads-tproxy.golden | 3 +++ .../source/local-and-inbound-connections.golden | 14 +++++++------- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go index f72f6ec314..56b032697c 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go @@ -143,6 +143,7 @@ func (b *Builder) buildDestination( b.addRoute(routeName, &pbproxystate.Route{ VirtualHosts: []*pbproxystate.VirtualHost{{ Name: routeName, + Domains: []string{"*"}, RouteRules: proxyRouteRules, }}, }) @@ -185,6 +186,7 @@ func (b *Builder) buildDestination( b.addRoute(routeName, &pbproxystate.Route{ VirtualHosts: []*pbproxystate.VirtualHost{{ Name: routeName, + Domains: []string{"*"}, RouteRules: proxyRouteRules, }}, }) diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden index 000f94ea34..2118c1eccb 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden @@ -239,6 +239,9 @@ "default/local/default/api-1:http:1.1.1.1:1234": { "virtualHosts": [ { + "domains": [ + "*" + ], "name": "default/local/default/api-1:http:1.1.1.1:1234", "routeRules": [ { diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden index 7fe5d2850c..fb9b8a52ea 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden @@ -328,6 +328,9 @@ "default/local/default/api-app": { "virtualHosts": [ { + "domains": [ + "*" + ], "name": "default/local/default/api-app", "routeRules": [ { @@ -349,6 +352,9 @@ "default/local/default/api-app2": { "virtualHosts": [ { + "domains": [ + "*" + ], "name": "default/local/default/api-app2", "routeRules": [ { diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden index cdf1275e0d..e29403f0f8 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden @@ -184,6 +184,9 @@ "default/local/default/api-app": { "virtualHosts": [ { + "domains": [ + "*" + ], "name": "default/local/default/api-app", "routeRules": [ { diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden index cdf1275e0d..e29403f0f8 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden @@ -184,6 +184,9 @@ "default/local/default/api-app": { "virtualHosts": [ { + "domains": [ + "*" + ], "name": "default/local/default/api-app", "routeRules": [ { diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden index 77d52fd90b..e59b310067 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden @@ -17,12 +17,12 @@ "endpointGroup": { "static": { "config": { - "connectTimeout": "6s", "circuitBreakers": { "upstreamLimits": { "maxConnections": 123 } - } + }, + "connectTimeout": "6s" } } }, @@ -32,12 +32,12 @@ "endpointGroup": { "static": { "config": { - "connectTimeout": "8s", "circuitBreakers": { "upstreamLimits": { "maxConnections": 123 } - } + }, + "connectTimeout": "8s" } } }, @@ -101,6 +101,7 @@ }, "listeners": [ { + "balanceConnections": "BALANCE_CONNECTIONS_EXACT", "capabilities": [ "CAPABILITY_L4_TLS_INSPECTION" ], @@ -110,7 +111,6 @@ "port": 20000 }, "name": "public_listener", - "balanceConnections": "BALANCE_CONNECTIONS_EXACT", "routers": [ { "inboundTls": { @@ -127,7 +127,7 @@ "cluster": { "name": "local_app:port1" }, - "maxInboundConnections": 123, + "maxInboundConnections": "123", "statPrefix": "public_listener", "trafficPermissions": {} }, @@ -149,10 +149,10 @@ } }, "l7": { + "maxInboundConnections": "123", "route": { "name": "public_listener:port3" }, - "maxInboundConnections": 123, "statPrefix": "public_listener", "staticRoute": true, "trafficPermissions": {}