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

Simplify List() signature in clients.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-12-02 12:12:57 +01:00
parent 800012dfb8
commit 6dcb689d4e
141 changed files with 532 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/kubectl.go
View File

@@ -42,7 +42,6 @@ import (
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/labels"
@@ -530,7 +529,7 @@ var _ = Describe("Kubectl client", func() {
checkOutput(output, requiredStrings)
// Node
nodes, err := c.Nodes().List(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
nodes, err := c.Nodes().List(unversioned.ListOptions{})
Expect(err).NotTo(HaveOccurred())
node := nodes.Items[0]
output = runKubectlOrDie("describe", "node", node.Name)
@@ -1088,7 +1087,9 @@ func forEachReplicationController(c *client.Client, ns, selectorKey, selectorVal
var rcs *api.ReplicationControllerList
var err error
for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) {
rcs, err = c.ReplicationControllers(ns).List(labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})), fields.Everything(), unversioned.ListOptions{})
label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}}
rcs, err = c.ReplicationControllers(ns).List(options)
Expect(err).NotTo(HaveOccurred())
if len(rcs.Items) > 0 {
break