luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

[Backport 1.16.x] Add CE version of Gateway Upstream Disambiguation (#19867) 

Add CE version of Gateway Upstream Disambiguation

Co-authored-by: Thomas Eckert <teckert@hashicorp.com>
This commit is contained in:
Andrew Stucki 2023-12-08 11:46:23 -05:00 committed by GitHub
parent b2a57ae0fd
commit 0fafa010bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/19860.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
connect: Solves an issue where two upstream services with the same name in different namespaces were not getting routed to correctly by API Gateways.
```

2
agent/consul/discoverychain/gateway.go
View File

@ -254,7 +254,7 @@ func targetForResolverNode(nodeName string, chains []*structs.CompiledDiscoveryC
splitterName := splitterPrefix + strings.TrimPrefix(nodeName, resolverPrefix) splitterName := splitterPrefix + strings.TrimPrefix(nodeName, resolverPrefix)
for _, c := range chains { for _, c := range chains {
targetChainPrefix := resolverPrefix + c.ServiceName + "." targetChainPrefix := resolverPrefix + c.ID()
if strings.HasPrefix(nodeName, targetChainPrefix) && len(c.Nodes) == 1 { if strings.HasPrefix(nodeName, targetChainPrefix) && len(c.Nodes) == 1 {
// we have a virtual resolver that just maps to another resolver, return // we have a virtual resolver that just maps to another resolver, return
// the given node name // the given node name

1
agent/consul/discoverychain/gateway_test.go
View File

@ -618,6 +618,7 @@ func TestGatewayChainSynthesizer_Synthesize(t *testing.T) {
chain: &structs.CompiledDiscoveryChain{ chain: &structs.CompiledDiscoveryChain{
ServiceName: "foo", ServiceName: "foo",
Namespace: "default", Namespace: "default",
Partition: "default",
Datacenter: "dc1", Datacenter: "dc1",
StartNode: "resolver:foo-2.default.default.dc2", StartNode: "resolver:foo-2.default.default.dc2",
Nodes: map[string]*structs.DiscoveryGraphNode{ Nodes: map[string]*structs.DiscoveryGraphNode{