From c6d64a80782216c3af1233594318972ad994ba52 Mon Sep 17 00:00:00 2001 From: freddygv Date: Thu, 8 Apr 2021 11:27:57 -0600 Subject: [PATCH] Stable sort cidr ranges to match on --- agent/xds/listeners.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 71762b9752..01e236d42a 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -192,6 +192,12 @@ func (s *Server) listenersFromSnapshotConnectProxy(cInfo connectionInfo, cfgSnap PrefixLen: &wrappers.UInt32Value{Value: pfxLen}, }) } + + // The match rules are stable sorted to avoid draining if the list is provided out of order + sort.SliceStable(ranges, func(i, j int) bool { + return ranges[i].AddressPrefix < ranges[j].AddressPrefix + }) + filterChain.FilterChainMatch = &envoy_listener_v3.FilterChainMatch{ PrefixRanges: ranges, }