github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Switch to versioned ListOptions in client.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-12-10 10:39:03 +01:00
parent 4ef062c22f
commit 960808bf08
167 changed files with 602 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/nodeoutofdisk.go
View File

@@ -24,7 +24,6 @@ import (
cadvisorapi "github.com/google/cadvisor/info/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
@@ -140,7 +139,7 @@ var _ = Describe("NodeOutOfDisk", func() {
"source": "scheduler",
"reason": "FailedScheduling",
}.AsSelector()
options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}}
options := api.ListOptions{FieldSelector: selector}
schedEvents, err := c.Events(ns).List(options)
expectNoError(err)
@@ -203,7 +202,7 @@ func availCpu(c *client.Client, node *api.Node) (int64, error) {
podClient := c.Pods(api.NamespaceAll)
selector := fields.Set{"spec.nodeName": node.Name}.AsSelector()
options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}}
options := api.ListOptions{FieldSelector: selector}
pods, err := podClient.List(options)
if err != nil {
return 0, fmt.Errorf("failed to retrieve all the pods on node %s: %v", node.Name, err)