Skip to content

Commit cc7c862

Browse files
committed
e2e: use apiserver view of pods on node instead of kubelet
Conformance tests must not rely on the kubelet API in order to pass. SchedulerPredicates tests attempt to use the kubelet API in their BeforeEach, some of which are tagged as Conformance. Is there a compelling reason to use the kubelet's view of pods for a given node instead of the apiserver's view of the pods?
1 parent dda530c commit cc7c862

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

test/e2e/scheduling/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ go_library(
4343
"//test/e2e/framework:go_default_library",
4444
"//test/e2e/framework/gpu:go_default_library",
4545
"//test/e2e/framework/job:go_default_library",
46-
"//test/e2e/framework/kubelet:go_default_library",
4746
"//test/e2e/framework/node:go_default_library",
4847
"//test/e2e/framework/pod:go_default_library",
4948
"//test/e2e/framework/providers/gce:go_default_library",

test/e2e/scheduling/predicates.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
clientset "k8s.io/client-go/kubernetes"
3232
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
3333
"k8s.io/kubernetes/test/e2e/framework"
34-
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
3534
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3635
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3736
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
@@ -112,8 +111,8 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
112111
framework.ExpectNoError(err)
113112

114113
for _, node := range nodeList.Items {
115-
framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
116-
printAllKubeletPods(cs, node.Name)
114+
framework.Logf("\nLogging pods the apiserver thinks is on node %v before test", node.Name)
115+
printAllPodsOnNode(cs, node.Name)
117116
}
118117

119118
})
@@ -796,11 +795,11 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
796795
})
797796
})
798797

799-
// printAllKubeletPods outputs status of all kubelet pods into log.
800-
func printAllKubeletPods(c clientset.Interface, nodeName string) {
801-
podList, err := e2ekubelet.GetKubeletPods(c, nodeName)
798+
// printAllPodsOnNode outputs status of all kubelet pods into log.
799+
func printAllPodsOnNode(c clientset.Interface, nodeName string) {
800+
podList, err := c.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{FieldSelector: "spec.nodeName=" + nodeName})
802801
if err != nil {
803-
framework.Logf("Unable to retrieve kubelet pods for node %v: %v", nodeName, err)
802+
framework.Logf("Unable to retrieve pods for node %v: %v", nodeName, err)
804803
return
805804
}
806805
for _, p := range podList.Items {

0 commit comments

Comments
 (0)