@@ -48,7 +48,7 @@ func DeletePodOrFail(c clientset.Interface, ns, name string) {
48
48
}
49
49
50
50
// DeletePodWithWait deletes the passed-in pod and waits for the pod to be terminated. Resilient to the pod
51
- // not existing. Also waits for all owned resources to be deleted.
51
+ // not existing.
52
52
func DeletePodWithWait (c clientset.Interface , pod * v1.Pod ) error {
53
53
if pod == nil {
54
54
return nil
@@ -57,17 +57,10 @@ func DeletePodWithWait(c clientset.Interface, pod *v1.Pod) error {
57
57
}
58
58
59
59
// DeletePodWithWaitByName deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod
60
- // not existing. Also waits for all owned resources to be deleted.
60
+ // not existing.
61
61
func DeletePodWithWaitByName (c clientset.Interface , podName , podNamespace string ) error {
62
62
e2elog .Logf ("Deleting pod %q in namespace %q" , podName , podNamespace )
63
- deletionPolicy := metav1 .DeletePropagationForeground
64
- err := c .CoreV1 ().Pods (podNamespace ).Delete (context .TODO (), podName ,
65
- metav1.DeleteOptions {
66
- // If the pod is the owner of some resources (like ephemeral inline volumes),
67
- // then we want to be sure that those are also gone before we return.
68
- // Blocking pod deletion via metav1.DeletePropagationForeground achieves that.
69
- PropagationPolicy : & deletionPolicy ,
70
- })
63
+ err := c .CoreV1 ().Pods (podNamespace ).Delete (context .TODO (), podName , metav1.DeleteOptions {})
71
64
if err != nil {
72
65
if apierrors .IsNotFound (err ) {
73
66
return nil // assume pod was already deleted
0 commit comments