Merge pull request #41060 from wojtek-t/fix_too_old_watch_errors

Automatic merge from submit-queue (batch tested with PRs 40382, 41060) Fix incorrect watch cache sizes Fix #41013

Merge pull request #41060 from wojtek-t/fix_too_old_watch_errors
844407e6 · Kubernetes Submit Queue · GitHub · 51901ef8 · 8985c6ba · 844407e6
Commit 844407e6 authored Feb 07, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

store.go ...c/k8s.io/apiserver/pkg/registry/generic/registry/store.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go
@@ -1125,7 +1125,7 @@ func (e *Store) CompleteWithOptions(options *generic.StoreOptions) error {
 	if e.Storage == nil {
 		capacity := DefaultWatchCacheSize
 		if e.WatchCacheSize != 0 {
-			capacity = DefaultWatchCacheSize
+			capacity = e.WatchCacheSize
 		}
 		e.Storage, e.DestroyFunc = opts.Decorator(
 			e.Copier,