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

Scrub VirtualIPs before exporting

This commit is contained in:
Chris S. Kim 2022-07-13 12:12:06 -04:00 committed by Chris S. Kim
parent a7ea6cb771
commit 0936942b2d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
agent/grpc-external/services/peerstream/subscription_manager.go
View File

@ -169,13 +169,6 @@ func (m *subscriptionManager) handleEvent(ctx context.Context, state *subscripti
// skip checks since we just generated one from scratch // 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) id := servicePayloadIDPrefix + strings.TrimPrefix(u.CorrelationID, subExportedService)
// Just ferry this one directly along to the destination. // 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 { if instance.Service.Connect != nil || instance.Service.Proxy != nil {
instance.Service.Connect = nil instance.Service.Connect = nil
instance.Service.Proxy = 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 = proto.Clone(csn).(*pbservice.CheckServiceNode)
csn.Service.Connect = nil csn.Service.Connect = nil
csn.Service.Proxy = 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) newNodes = append(newNodes, csn)