github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +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

33
test/e2e/pods.go
View File

@@ -32,7 +32,6 @@ import (
"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/kubelet"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util"
@@ -300,13 +299,15 @@ var _ = Describe("Pods", func() {
}
By("setting up watch")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err := podClient.List(options)
if err != nil {
Failf("Failed to query for pods: %v", err)
}
Expect(len(pods.Items)).To(Equal(0))
options := unversioned.ListOptions{
LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))},
options = unversioned.ListOptions{
LabelSelector: unversioned.LabelSelector{selector},
ResourceVersion: pods.ListMeta.ResourceVersion,
}
w, err := podClient.Watch(options)
@@ -325,7 +326,9 @@ var _ = Describe("Pods", func() {
}
By("verifying the pod is in kubernetes")
pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err = podClient.List(options)
if err != nil {
Failf("Failed to query for pods: %v", err)
}
@@ -369,7 +372,9 @@ var _ = Describe("Pods", func() {
Expect(lastPod.DeletionTimestamp).ToNot(BeNil())
Expect(lastPod.Spec.TerminationGracePeriodSeconds).ToNot(BeZero())
pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err = podClient.List(options)
if err != nil {
Fail(fmt.Sprintf("Failed to list pods to verify deletion: %v", err))
}
@@ -423,7 +428,9 @@ var _ = Describe("Pods", func() {
expectNoError(framework.WaitForPodRunning(pod.Name))
By("verifying the pod is in kubernetes")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err := podClient.List(options)
Expect(len(pods.Items)).To(Equal(1))
// Standard get, update retry loop
@@ -453,7 +460,9 @@ var _ = Describe("Pods", func() {
expectNoError(framework.WaitForPodRunning(pod.Name))
By("verifying the updated pod is in kubernetes")
pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err = podClient.List(options)
Expect(len(pods.Items)).To(Equal(1))
Logf("Pod update OK")
})
@@ -1039,7 +1048,9 @@ var _ = Describe("Pods", func() {
expectNoError(framework.WaitForPodRunning(pod.Name))
By("verifying the pod is in kubernetes")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err := podClient.List(options)
if err != nil {
Failf("Failed to query for pods: %v", err)
}
@@ -1112,7 +1123,9 @@ var _ = Describe("Pods", func() {
expectNoError(framework.WaitForPodRunning(pod.Name))
By("verifying the pod is in kubernetes")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(), unversioned.ListOptions{})
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
pods, err := podClient.List(options)
if err != nil {
Failf("Failed to query for pods: %v", err)
}