status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-25 03:45:27 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
View File

@ -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,
}},
})

3
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden vendored
View File

@ -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": [
{

6
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden vendored
View File

@ -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": [
{

3
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden vendored
View File

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

3
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden vendored
View File

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

14
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden vendored
View File

@ -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": {}