From c60809aead9a5d2db3bbad09c1897798018bb69c Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Mon, 23 Jan 2017 13:38:37 -0500 Subject: [PATCH] Test changes due to client-go staging changes --- test/e2e/disruption.go | 4 ++-- test/e2e/generated_clientset.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index c6e41286a4a..f5d80ac1274 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -136,7 +136,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() { // Locate a running pod. var pod v1.Pod err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) { - podList, err := cs.Pods(ns).List(v1.ListOptions{}) + podList, err := cs.Pods(ns).List(metav1.ListOptions{}) if err != nil { return false, err } @@ -231,7 +231,7 @@ func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { By("Waiting for all pods to be running") err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) { - pods, err := cs.Core().Pods(ns).List(v1.ListOptions{LabelSelector: "foo=bar"}) + pods, err := cs.Core().Pods(ns).List(metav1.ListOptions{LabelSelector: "foo=bar"}) if err != nil { return false, err } diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index e63b90034f7..6509f71726a 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -323,7 +323,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() { podCopy := stagingClientPod(name, value) pod := &podCopy By("verifying no pod exists before the test") - pods, err := podClient.List(clientv1.ListOptions{}) + pods, err := podClient.List(metav1.ListOptions{}) if err != nil { framework.Failf("Failed to query for pods: %v", err) } @@ -337,7 +337,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() { By("verifying the pod is in kubernetes") timeout := 1 * time.Minute if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) { - pods, err = podClient.List(clientv1.ListOptions{}) + pods, err = podClient.List(metav1.ListOptions{}) if err != nil { return false, err }