Fix for the SDS update failure

envoyproxy · Dec 12, 2022 · 60e490f · 60e490f
1 parent 5a401ce
commit 60e490f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/pkg/server/delta/v3/server.go b/pkg/server/delta/v3/server.go
@@ -120,7 +120,18 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 			watch := watches.deltaWatches[typ]
 			watch.nonce = nonce
 
-			watch.state.SetResourceVersions(resp.GetNextVersionMap())
+			if !watch.state.IsWildcard() {
+				for k, hash := range resp.GetNextVersionMap() {
+					if currHash, found := watch.state.GetResourceVersions()[k]; found {
+						if currHash != hash {
+							watch.state.GetResourceVersions()[k] = hash
+						}
+					}
+				}
+			} else {
+				watch.state.SetResourceVersions(resp.GetNextVersionMap())
+			}
+
 			watches.deltaWatches[typ] = watch
 		case req, more := <-reqCh:
 			// input stream ended or errored out