Backport of mesh: provide missing domain to route configurations in P…

…roxyStateTemplate into release/1.17.0 (#19305) * backport of commit 21c8b5e * backport of commit 925d695 --------- Co-authored-by: Nitya Dhanushkodi <[email protected]>
hashicorp · Oct 20, 2023 · 6a39ad2 · 6a39ad2
1 parent b1c8a92
commit 6a39ad2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git 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/...rnal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden b/...rnal/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/...der/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/...der/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/...uilder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/...uilder/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/...ion/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/...ion/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/...nal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections.golden b/...nal/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": {}