diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 2fcc51d2c5c..a7466c354fd 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -71,7 +71,6 @@ go_library( "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/events:go_default_library", - "//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/network:go_default_library", "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/pod:go_default_library", diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index a0005e61bab..70e19d87a6c 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -42,7 +42,6 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/test/e2e/framework" - e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2ewebsocket "k8s.io/kubernetes/test/e2e/framework/websocket" imageutils "k8s.io/kubernetes/test/utils/image" @@ -301,28 +300,6 @@ var _ = framework.KubeDescribe("Pods", func() { err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(30)) framework.ExpectNoError(err, "failed to delete pod") - ginkgo.By("verifying the kubelet observed the termination notice") - err = wait.Poll(time.Second*5, time.Second*30, func() (bool, error) { - podList, err := e2ekubelet.GetKubeletPods(f.ClientSet, pod.Spec.NodeName) - if err != nil { - framework.Logf("Unable to retrieve kubelet pods for node %v: %v", pod.Spec.NodeName, err) - return false, nil - } - for _, kubeletPod := range podList.Items { - if pod.Name != kubeletPod.Name { - continue - } - if kubeletPod.ObjectMeta.DeletionTimestamp == nil { - framework.Logf("deletion has not yet been observed") - return false, nil - } - return true, nil - } - framework.Logf("no pod exists with the name we were looking for, assuming the termination request was observed and completed") - return true, nil - }) - framework.ExpectNoError(err, "kubelet never observed the termination notice") - ginkgo.By("verifying pod deletion was observed") deleted := false var lastPod *v1.Pod diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 16d03e657d6..6f4fc9ca720 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -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", diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 2e11e22fafa..462646e177d 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -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 {