Request for bookmarks in RetryWatcher

Author: wojtek-t

staging/src/k8s.io/client-go/tools/watch/retrywatcher.go

@@ -101,7 +101,8 @@ func (rw *RetryWatcher) send(event watch.Event) bool {
 // If it is not done the second return value holds the time to wait before calling it again.
 func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
 	watcher, err := rw.watcherClient.Watch(metav1.ListOptions{
-		ResourceVersion: rw.lastResourceVersion,
+		ResourceVersion:     rw.lastResourceVersion,
+		AllowWatchBookmarks: true,
 	})
 	// We are very unlikely to hit EOF here since we are just establishing the call,
 	// but it may happen that the apiserver is just shutting down (e.g. being restarted)
@@ -174,10 +175,12 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
 					return true, 0
 				}
 
-				// All is fine; send the event and update lastResourceVersion
-				ok = rw.send(event)
-				if !ok {
-					return true, 0
+				// All is fine; send the non-bookmark events and update resource version.
+				if event.Type != watch.Bookmark {
+					ok = rw.send(event)
+					if !ok {
+						return true, 0
+					}
 				}
 				rw.lastResourceVersion = resourceVersion