From 6a40cc90e9be5b1ff3ca0a0e5273dc66b8c3d0c9 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 21 Jul 2020 22:40:31 +0300 Subject: [PATCH] Revert "e2epod: use foreground deletion" This reverts commit af91e76d "e2epod: use foreground deletion" and fixes node-kubelet-conformance tests. --- test/e2e/framework/pod/delete.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/test/e2e/framework/pod/delete.go b/test/e2e/framework/pod/delete.go index 9fac26bb95e..a9c29526bd6 100644 --- a/test/e2e/framework/pod/delete.go +++ b/test/e2e/framework/pod/delete.go @@ -48,7 +48,7 @@ func DeletePodOrFail(c clientset.Interface, ns, name string) { } // DeletePodWithWait deletes the passed-in pod and waits for the pod to be terminated. Resilient to the pod -// not existing. Also waits for all owned resources to be deleted. +// not existing. func DeletePodWithWait(c clientset.Interface, pod *v1.Pod) error { if pod == nil { return nil @@ -57,17 +57,10 @@ func DeletePodWithWait(c clientset.Interface, pod *v1.Pod) error { } // DeletePodWithWaitByName deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod -// not existing. Also waits for all owned resources to be deleted. +// not existing. func DeletePodWithWaitByName(c clientset.Interface, podName, podNamespace string) error { e2elog.Logf("Deleting pod %q in namespace %q", podName, podNamespace) - deletionPolicy := metav1.DeletePropagationForeground - err := c.CoreV1().Pods(podNamespace).Delete(context.TODO(), podName, - metav1.DeleteOptions{ - // If the pod is the owner of some resources (like ephemeral inline volumes), - // then we want to be sure that those are also gone before we return. - // Blocking pod deletion via metav1.DeletePropagationForeground achieves that. - PropagationPolicy: &deletionPolicy, - }) + err := c.CoreV1().Pods(podNamespace).Delete(context.TODO(), podName, metav1.DeleteOptions{}) if err != nil { if apierrors.IsNotFound(err) { return nil // assume pod was already deleted