mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Test changes due to client-go staging changes
This commit is contained in:
parent
da7b2b9c53
commit
c60809aead
@ -136,7 +136,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
|
|||||||
// Locate a running pod.
|
// Locate a running pod.
|
||||||
var pod v1.Pod
|
var pod v1.Pod
|
||||||
err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
|
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 {
|
if err != nil {
|
||||||
return false, err
|
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) {
|
func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) {
|
||||||
By("Waiting for all pods to be running")
|
By("Waiting for all pods to be running")
|
||||||
err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
|
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 {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
|
|||||||
podCopy := stagingClientPod(name, value)
|
podCopy := stagingClientPod(name, value)
|
||||||
pod := &podCopy
|
pod := &podCopy
|
||||||
By("verifying no pod exists before the test")
|
By("verifying no pod exists before the test")
|
||||||
pods, err := podClient.List(clientv1.ListOptions{})
|
pods, err := podClient.List(metav1.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Failf("Failed to query for pods: %v", err)
|
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")
|
By("verifying the pod is in kubernetes")
|
||||||
timeout := 1 * time.Minute
|
timeout := 1 * time.Minute
|
||||||
if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
|
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 {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user