From 51eb4b50a3a607ba15a215fdcaa50baea5777afb Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 2 Jan 2020 20:09:19 +0100 Subject: [PATCH] Don't paginate in listwatch --- staging/src/k8s.io/client-go/tools/cache/listwatch.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/client-go/tools/cache/listwatch.go b/staging/src/k8s.io/client-go/tools/cache/listwatch.go index 8227b73b698..10a15203581 100644 --- a/staging/src/k8s.io/client-go/tools/cache/listwatch.go +++ b/staging/src/k8s.io/client-go/tools/cache/listwatch.go @@ -17,14 +17,11 @@ limitations under the License. package cache import ( - "context" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" restclient "k8s.io/client-go/rest" - "k8s.io/client-go/tools/pager" ) // Lister is any object that knows how to perform an initial list. @@ -102,9 +99,8 @@ func NewFilteredListWatchFromClient(c Getter, resource string, namespace string, // List a set of apiserver resources func (lw *ListWatch) List(options metav1.ListOptions) (runtime.Object, error) { - if !lw.DisableChunking { - return pager.New(pager.SimplePageFunc(lw.ListFunc)).List(context.TODO(), options) - } + // ListWatch is used in Reflector, which already supports pagination. + // Don't paginate here to avoid duplication. return lw.ListFunc(options) }