mesh: provide missing domain to route configurations in ProxyStateTemplate (#19298)

* add empty domains

* update unit tests
This commit is contained in:
Nitya Dhanushkodi 2023-10-19 14:14:16 -07:00 committed by GitHub
parent 681aef31e9
commit def66ddf0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 7 deletions

View File

@ -143,6 +143,7 @@ func (b *Builder) buildDestination(
b.addRoute(routeName, &pbproxystate.Route{ b.addRoute(routeName, &pbproxystate.Route{
VirtualHosts: []*pbproxystate.VirtualHost{{ VirtualHosts: []*pbproxystate.VirtualHost{{
Name: routeName, Name: routeName,
Domains: []string{"*"},
RouteRules: proxyRouteRules, RouteRules: proxyRouteRules,
}}, }},
}) })
@ -185,6 +186,7 @@ func (b *Builder) buildDestination(
b.addRoute(routeName, &pbproxystate.Route{ b.addRoute(routeName, &pbproxystate.Route{
VirtualHosts: []*pbproxystate.VirtualHost{{ VirtualHosts: []*pbproxystate.VirtualHost{{
Name: routeName, Name: routeName,
Domains: []string{"*"},
RouteRules: proxyRouteRules, RouteRules: proxyRouteRules,
}}, }},
}) })

View File

@ -239,6 +239,9 @@
"default/local/default/api-1:http:1.1.1.1:1234": { "default/local/default/api-1:http:1.1.1.1:1234": {
"virtualHosts": [ "virtualHosts": [
{ {
"domains": [
"*"
],
"name": "default/local/default/api-1:http:1.1.1.1:1234", "name": "default/local/default/api-1:http:1.1.1.1:1234",
"routeRules": [ "routeRules": [
{ {

View File

@ -328,6 +328,9 @@
"default/local/default/api-app": { "default/local/default/api-app": {
"virtualHosts": [ "virtualHosts": [
{ {
"domains": [
"*"
],
"name": "default/local/default/api-app", "name": "default/local/default/api-app",
"routeRules": [ "routeRules": [
{ {
@ -349,6 +352,9 @@
"default/local/default/api-app2": { "default/local/default/api-app2": {
"virtualHosts": [ "virtualHosts": [
{ {
"domains": [
"*"
],
"name": "default/local/default/api-app2", "name": "default/local/default/api-app2",
"routeRules": [ "routeRules": [
{ {

View File

@ -184,6 +184,9 @@
"default/local/default/api-app": { "default/local/default/api-app": {
"virtualHosts": [ "virtualHosts": [
{ {
"domains": [
"*"
],
"name": "default/local/default/api-app", "name": "default/local/default/api-app",
"routeRules": [ "routeRules": [
{ {

View File

@ -184,6 +184,9 @@
"default/local/default/api-app": { "default/local/default/api-app": {
"virtualHosts": [ "virtualHosts": [
{ {
"domains": [
"*"
],
"name": "default/local/default/api-app", "name": "default/local/default/api-app",
"routeRules": [ "routeRules": [
{ {

View File

@ -17,12 +17,12 @@
"endpointGroup": { "endpointGroup": {
"static": { "static": {
"config": { "config": {
"connectTimeout": "6s",
"circuitBreakers": { "circuitBreakers": {
"upstreamLimits": { "upstreamLimits": {
"maxConnections": 123 "maxConnections": 123
} }
} },
"connectTimeout": "6s"
} }
} }
}, },
@ -32,12 +32,12 @@
"endpointGroup": { "endpointGroup": {
"static": { "static": {
"config": { "config": {
"connectTimeout": "8s",
"circuitBreakers": { "circuitBreakers": {
"upstreamLimits": { "upstreamLimits": {
"maxConnections": 123 "maxConnections": 123
} }
} },
"connectTimeout": "8s"
} }
} }
}, },
@ -101,6 +101,7 @@
}, },
"listeners": [ "listeners": [
{ {
"balanceConnections": "BALANCE_CONNECTIONS_EXACT",
"capabilities": [ "capabilities": [
"CAPABILITY_L4_TLS_INSPECTION" "CAPABILITY_L4_TLS_INSPECTION"
], ],
@ -110,7 +111,6 @@
"port": 20000 "port": 20000
}, },
"name": "public_listener", "name": "public_listener",
"balanceConnections": "BALANCE_CONNECTIONS_EXACT",
"routers": [ "routers": [
{ {
"inboundTls": { "inboundTls": {
@ -127,7 +127,7 @@
"cluster": { "cluster": {
"name": "local_app:port1" "name": "local_app:port1"
}, },
"maxInboundConnections": 123, "maxInboundConnections": "123",
"statPrefix": "public_listener", "statPrefix": "public_listener",
"trafficPermissions": {} "trafficPermissions": {}
}, },
@ -149,10 +149,10 @@
} }
}, },
"l7": { "l7": {
"maxInboundConnections": "123",
"route": { "route": {
"name": "public_listener:port3" "name": "public_listener:port3"
}, },
"maxInboundConnections": 123,
"statPrefix": "public_listener", "statPrefix": "public_listener",
"staticRoute": true, "staticRoute": true,
"trafficPermissions": {} "trafficPermissions": {}