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

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

4
test/e2e/kubectl.go
View File

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