github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

e2e: use apiserver view of pods on node instead of kubelet

Browse Source 
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?
This commit is contained in:
Aaron Crickenberger 2020-03-31 20:00:07 -07:00
parent dda530cfb7
commit cc7c862ce1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/scheduling/BUILD
View File

@ -43,7 +43,6 @@ go_library(
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/gpu:go_default_library",
"//test/e2e/framework/job:go_default_library",
"//test/e2e/framework/kubelet:go_default_library",
"//test/e2e/framework/node:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/providers/gce:go_default_library",

13
test/e2e/scheduling/predicates.go
View File

@ -31,7 +31,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/test/e2e/framework"
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
@ -112,8 +111,8 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
framework.ExpectNoError(err)
for _, node := range nodeList.Items {
framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
printAllKubeletPods(cs, node.Name)
framework.Logf("\nLogging pods the apiserver thinks is on node %v before test", node.Name)
printAllPodsOnNode(cs, node.Name)
}
})
@ -796,11 +795,11 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
})
})
// printAllKubeletPods outputs status of all kubelet pods into log.
func printAllKubeletPods(c clientset.Interface, nodeName string) {
podList, err := e2ekubelet.GetKubeletPods(c, nodeName)
// printAllPodsOnNode outputs status of all kubelet pods into log.
func printAllPodsOnNode(c clientset.Interface, nodeName string) {
podList, err := c.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{FieldSelector: "spec.nodeName=" + nodeName})
if err != nil {
framework.Logf("Unable to retrieve kubelet pods for node %v: %v", nodeName, err)
framework.Logf("Unable to retrieve pods for node %v: %v", nodeName, err)
return
}
for _, p := range podList.Items {