status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

NET-6319 - L7 routes have statePrefix of upstream. and should have a full path (#19473)

This commit is contained in:
John Murret 2023-11-02 19:58:54 -06:00 committed by GitHub
parent 2bc0bc30b9
commit d94d316204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "upstream.",
"statPrefix": "upstream.http.api-1.default.default.dc1",
"rds": {
"configSource": {
"ads": {},

4
agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden vendored
View File

@ -47,7 +47,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "upstream.",
"statPrefix": "upstream.http.api-app.default.default.dc1",
"rds": {
"configSource": {
"ads": {},
@ -140,7 +140,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "upstream.",
"statPrefix": "upstream.http.api-app2.default.default.dc1",
"rds": {
"configSource": {
"ads": {},

2
agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden vendored
View File

@ -47,7 +47,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "upstream.",
"statPrefix": "upstream.http.api-app.default.default.dc1",
"rds": {
"configSource": {
"ads": {},

2
agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden vendored
View File

@ -47,7 +47,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "upstream.",
"statPrefix": "upstream.http.api-app.default.default.dc1",
"rds": {
"configSource": {
"ads": {},

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

@ -248,7 +248,7 @@ func (b *Builder) buildDestination(
panic(fmt.Sprintf("it should not be possible to have a tcp protocol here: %v", effectiveProtocol))
}
rb := lb.addL7Router(routeName, "", effectiveProtocol)
rb := lb.addL7Router(routeName, statPrefix, effectiveProtocol)
if destination.Explicit == nil {
rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
}
@ -372,7 +372,7 @@ func (b *ListenerBuilder) addL4RouterForDirect(clusterName, statPrefix string) *
router := &pbproxystate.Router{}
if statPrefix == "" {
statPrefix = "upstream."
statPrefix = fmt.Sprintf("upstream.%s", clusterName)
}
router.Destination = &pbproxystate.Router_L4{

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

@ -234,7 +234,7 @@
"route": {
"name": "default/local/default/api-1:http:1.1.1.1:1234"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-1.default.default.dc1"
}
}
]

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

@ -257,7 +257,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,
@ -274,7 +274,7 @@
"route": {
"name": "default/local/default/api-app2:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app2.default.default.dc1"
},
"match": {
"destinationPort": 8080,

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

@ -152,7 +152,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,

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

@ -152,7 +152,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,

2
internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden vendored
View File

@ -285,7 +285,7 @@
"route": {
"name": "default/local/default/api-1:http:1.1.1.1:1234"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-1.default.default.dc1"
}
}
]

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

@ -330,7 +330,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,
@ -347,7 +347,7 @@
"route": {
"name": "default/local/default/api-app2:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app2.default.default.dc1"
},
"match": {
"destinationPort": 8080,

2
internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden vendored
View File

@ -192,7 +192,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,

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

@ -192,7 +192,7 @@
"route": {
"name": "default/local/default/api-app:http"
},
"statPrefix": "upstream."
"statPrefix": "upstream.http.api-app.default.default.dc1"
},
"match": {
"destinationPort": 8080,