From 0936942b2d72831a2c21e8c99684f6e1a2b5acdb Mon Sep 17 00:00:00 2001 From: "Chris S. Kim" Date: Wed, 13 Jul 2022 12:12:06 -0400 Subject: [PATCH] Scrub VirtualIPs before exporting --- .../services/peerstream/subscription_manager.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/agent/grpc-external/services/peerstream/subscription_manager.go b/agent/grpc-external/services/peerstream/subscription_manager.go index 65fd914e3..33726a216 100644 --- a/agent/grpc-external/services/peerstream/subscription_manager.go +++ b/agent/grpc-external/services/peerstream/subscription_manager.go @@ -169,13 +169,6 @@ func (m *subscriptionManager) handleEvent(ctx context.Context, state *subscripti // skip checks since we just generated one from scratch } - // Scrub raft indexes - for _, instance := range csn.Nodes { - instance.Node.RaftIndex = nil - instance.Service.RaftIndex = nil - // skip checks since we just generated one from scratch - } - id := servicePayloadIDPrefix + strings.TrimPrefix(u.CorrelationID, subExportedService) // Just ferry this one directly along to the destination. @@ -225,6 +218,9 @@ func (m *subscriptionManager) handleEvent(ctx context.Context, state *subscripti if instance.Service.Connect != nil || instance.Service.Proxy != nil { instance.Service.Connect = nil instance.Service.Proxy = nil + + // VirtualIPs assigned in this cluster won't make sense on the importing side + delete(instance.Service.TaggedAddresses, structs.TaggedAddressVirtualIP) } } @@ -286,6 +282,9 @@ func filterConnectReferences(orig *pbservice.IndexedCheckServiceNodes) { csn = proto.Clone(csn).(*pbservice.CheckServiceNode) csn.Service.Connect = nil csn.Service.Proxy = nil + + // VirtualIPs assigned in this cluster won't make sense on the importing side + delete(csn.Service.TaggedAddresses, structs.TaggedAddressVirtualIP) } newNodes = append(newNodes, csn)