From 4ba260958c04323c133d86773e301b2ea6809b93 Mon Sep 17 00:00:00 2001
From: Ashwin Venkatesh <ashwin@hashicorp.com>
Date: Thu, 29 Sep 2022 13:19:04 -0400
Subject: [PATCH] bug: watch local mesh gateways in non-default partitions with
 agentless (#14799)

---
 agent/proxycfg/upstreams.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/proxycfg/upstreams.go b/agent/proxycfg/upstreams.go
index 7f52924dd2..a2dc38b9d6 100644
--- a/agent/proxycfg/upstreams.go
+++ b/agent/proxycfg/upstreams.go
@@ -319,7 +319,7 @@ func (s *handlerUpstreams) resetWatchesFromChain(
 			}
 		case structs.MeshGatewayModeLocal:
 			gk = GatewayKey{
-				Partition:  s.source.NodePartitionOrDefault(),
+				Partition:  s.proxyID.PartitionOrDefault(),
 				Datacenter: s.source.Datacenter,
 			}
 		}