github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass ListOptions to List() methods.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-11-26 11:06:01 +01:00
parent 7644d34759
commit 8343c8ce6c
138 changed files with 376 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/daemon_restart.go
View File

@@ -171,7 +171,7 @@ func replacePods(pods []*api.Pod, store cache.Store) {
// getContainerRestarts returns the count of container restarts across all pods matching the given labelSelector,
// and a list of nodenames across which these containers restarted.
func getContainerRestarts(c *client.Client, ns string, labelSelector labels.Selector) (int, []string) {
pods, err := c.Pods(ns).List(labelSelector, fields.Everything())
pods, err := c.Pods(ns).List(labelSelector, fields.Everything(), unversioned.ListOptions{})
expectNoError(err)
failedContainers := 0
containerRestartNodes := sets.NewString()
@@ -221,7 +221,7 @@ var _ = Describe("DaemonRestart", func() {
newPods, controller = controllerframework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
return framework.Client.Pods(ns).List(labelSelector, fields.Everything())
return framework.Client.Pods(ns).List(labelSelector, fields.Everything(), unversioned.ListOptions{})
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return framework.Client.Pods(ns).Watch(labelSelector, fields.Everything(), options)