Skip to content

K
k3s
Unverified Commit 1bfbf861 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66717 from bboreham/remove-timeoutFromListOptions

Automatic merge from submit-queue (batch tested with PRs 67323, 66717, 67038). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove unused function timeoutFromListOptions() **What this PR does / why we need it**: It removes a function which is not exported and not called or referenced. Re-opening #60215 after rebase. **Which issue(s) this PR fixes** No issue. **Special notes for your reviewer**: I guess it would be useful to know what this was supposed to be doing. I just happened upon it when trying to understand how watch timeouts were configured. **Release note**: ```release-note NONE ```
parents 34b1e942 2663fee4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
staging/src/k8s.io/client-go/tools/cache/listwatch.go
View file @ 1bfbf861
...@@ -18,7 +18,6 @@ package cache ...@@ -18,7 +18,6 @@ package cache
import ( import (
"context" "context"
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
...@@ -91,13 +90,6 @@ func NewFilteredListWatchFromClient(c Getter, resource string, namespace string, ...@@ -91,13 +90,6 @@ func NewFilteredListWatchFromClient(c Getter, resource string, namespace string,
return &ListWatch{ListFunc: listFunc, WatchFunc: watchFunc} return &ListWatch{ListFunc: listFunc, WatchFunc: watchFunc}
} }
func timeoutFromListOptions(options metav1.ListOptions) time.Duration {
if options.TimeoutSeconds != nil {
return time.Duration(*options.TimeoutSeconds) * time.Second
}
return 0
}
// List a set of apiserver resources // List a set of apiserver resources
func (lw *ListWatch) List(options metav1.ListOptions) (runtime.Object, error) { func (lw *ListWatch) List(options metav1.ListOptions) (runtime.Object, error) {
if !lw.DisableChunking { if !lw.DisableChunking {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment