fix(MeshGateway): cross-mesh gateways with same service

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Nov 2, 2022 · 2b7053c · 2b7053c
1 parent 9b2c753
commit 2b7053c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/xds/generator/outbound_proxy_generator.go b/pkg/xds/generator/outbound_proxy_generator.go
@@ -375,14 +375,15 @@ func (OutboundProxyGenerator) determineRoutes(
 				isExternalService = true
 			}
 
+			allTags := envoy_common.Tags(destination.Destination)
 			cluster := envoy_common.NewCluster(
 				envoy_common.WithService(service),
 				envoy_common.WithName(name),
 				envoy_common.WithWeight(destination.GetWeight().GetValue()),
 				// The mesh tag is set here if this destination is generated
 				// from a MeshGateway virtual outbound and is not part of the
 				// service tags
-				envoy_common.WithTags(envoy_common.Tags(destination.Destination).WithoutTags(mesh_proto.MeshTag)),
+				envoy_common.WithTags(allTags.WithoutTags(mesh_proto.MeshTag)),
 				envoy_common.WithTimeout(timeoutConf),
 				envoy_common.WithLB(route.Spec.GetConf().GetLoadBalancer()),
 				envoy_common.WithExternalService(isExternalService),
@@ -392,10 +393,10 @@ func (OutboundProxyGenerator) determineRoutes(
 				cluster.SetMesh(mesh)
 			}
 
-			if name, ok := clusterCache[cluster.Tags().String()]; ok {
+			if name, ok := clusterCache[allTags.String()]; ok {
 				cluster.SetName(name)
 			} else {
-				clusterCache[cluster.Tags().String()] = cluster.Name()
+				clusterCache[allTags.String()] = cluster.Name()
 			}
 
 			if isExternalService {