github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-22 02:18:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18080 from wojtek-t/list_options_in_listwatch

Browse Source 
Pass ListOptions to List in ListWatch.
This commit is contained in:
Wojciech Tyczynski
2015-12-09 14:27:51 +01:00
parent 78c31b6769 b0fcb5adef
commit a915b8b29a
38 changed files with 105 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/density.go
View File

@@ -235,8 +235,8 @@ var _ = Describe("Density [Skipped]", func() {
events := make([](*api.Event), 0)
_, controller := controllerframework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
return c.Events(ns).List(unversioned.ListOptions{})
ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) {
return c.Events(ns).List(options)
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return c.Events(ns).Watch(options)
@@ -318,9 +318,9 @@ var _ = Describe("Density [Skipped]", func() {
additionalPodsPrefix = "density-latency-pod-" + string(util.NewUUID())
_, controller := controllerframework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) {
selector := labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix})
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
options.LabelSelector.Selector = selector
return c.Pods(ns).List(options)
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {