From d72ff0f8aff63aaa42224713a1248a6952a96c12 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 20 Mar 2020 13:02:15 -0300 Subject: [PATCH] Ensure DeleteDeployment waits until there are no pods running (#5269) --- test/e2e/framework/deployment.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go index 751147891..35a060cd0 100644 --- a/test/e2e/framework/deployment.go +++ b/test/e2e/framework/deployment.go @@ -368,9 +368,14 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32 func (f *Framework) DeleteDeployment(name string) error { d, err := f.KubeClientSet.AppsV1().Deployments(f.Namespace).Get(name, metav1.GetOptions{}) assert.Nil(ginkgo.GinkgoT(), err, "getting deployment") - err = f.KubeClientSet.AppsV1().Deployments(f.Namespace).Delete(name, &metav1.DeleteOptions{}) + + grace := int64(0) + err = f.KubeClientSet.AppsV1().Deployments(f.Namespace).Delete(name, &metav1.DeleteOptions{ + GracePeriodSeconds: &grace, + }) assert.Nil(ginkgo.GinkgoT(), err, "deleting deployment") - return WaitForPodsDeleted(f.KubeClientSet, time.Second*60, f.Namespace, metav1.ListOptions{ + + return WaitForPodsDeleted(f.KubeClientSet, 2*time.Minute, f.Namespace, metav1.ListOptions{ LabelSelector: labelSelectorToString(d.Spec.Selector.MatchLabels), }) }