proxycfg: use external addresses in tproxy when crossing partition bo…

…undaries (#11823)
hashicorp · Dec 13, 2021 · ac4daf1 · ac4daf1
1 parent a89d859
commit ac4daf1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/agent/proxycfg/upstreams.go b/agent/proxycfg/upstreams.go
@@ -108,8 +108,10 @@ func (s *handlerUpstreams) handleUpdateUpstreams(ctx context.Context, u cache.Up
 					}
 				}
 
-				// TODO(partitions) Update to account for upstream in remote partition once tproxy supports it
-				addr, _ := node.BestAddress(false)
+				// Make sure to use an external address when crossing partitions.
+				isRemote := !structs.EqualPartitions(svc.PartitionOrDefault(), s.proxyID.PartitionOrDefault())
+				addr, _ := node.BestAddress(isRemote)
+
 				upstreamsSnapshot.PassthroughUpstreams[svc.String()].Addrs[addr] = struct{}{}
 			}
 		}