diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/delegator.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/delegator.go index 6c0287c735b..4cb664845d5 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/delegator.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/delegator.go @@ -257,14 +257,14 @@ func shouldDelegateList(opts storage.ListOptions, cache delegator.Helper) (deleg case metav1.ResourceVersionMatchNotOlderThan: return delegator.Result{ShouldDelegate: false}, nil case "": - // Legacy exact match - if opts.Predicate.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" { - return cache.ShouldDelegateExactRV(opts.ResourceVersion, opts.Recursive) - } // Continue if len(opts.Predicate.Continue) > 0 { return cache.ShouldDelegateContinue(opts.Predicate.Continue, opts.Recursive) } + // Legacy exact match + if opts.Predicate.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" { + return cache.ShouldDelegateExactRV(opts.ResourceVersion, opts.Recursive) + } // Consistent Read if opts.ResourceVersion == "" { return cache.ShouldDelegateConsistentRead() diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/list_work_estimator.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/list_work_estimator.go index 004614314b3..bc79aac3297 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/list_work_estimator.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/list_work_estimator.go @@ -172,14 +172,14 @@ func shouldDelegateList(opts *metav1.ListOptions, cache delegator.Helper) (deleg case metav1.ResourceVersionMatchNotOlderThan: return delegator.Result{ShouldDelegate: false}, nil case "": - // Legacy exact match - if opts.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" { - return cache.ShouldDelegateExactRV(opts.ResourceVersion, defaultRecursive) - } // Continue if len(opts.Continue) > 0 { return cache.ShouldDelegateContinue(opts.Continue, defaultRecursive) } + // Legacy exact match + if opts.Limit > 0 && len(opts.ResourceVersion) > 0 && opts.ResourceVersion != "0" { + return cache.ShouldDelegateExactRV(opts.ResourceVersion, defaultRecursive) + } // Consistent Read if opts.ResourceVersion == "" { return cache.ShouldDelegateConsistentRead()