github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75280 from pontiyaraja/volumes

Browse Source 
removed time flaky and added default pod delete timeout
This commit is contained in:
Kubernetes Prow Robot
2019-03-21 17:32:17 -07:00
committed by GitHub
parent 0c93929298 48440bdb73
commit e5d99f893b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/pv_util.go
View File

@@ -507,7 +507,6 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) error {
// Deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod // Deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod
// not existing. // not existing.
func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNamespace string) error { func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNamespace string) error {
const maxWait = 5 * time.Minute
Logf("Deleting pod %q in namespace %q", podName, podNamespace) Logf("Deleting pod %q in namespace %q", podName, podNamespace)
err := c.CoreV1().Pods(podNamespace).Delete(podName, nil) err := c.CoreV1().Pods(podNamespace).Delete(podName, nil)
if err != nil { if err != nil {
@@ -516,8 +515,8 @@ func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNa
} }
return fmt.Errorf("pod Delete API error: %v", err) return fmt.Errorf("pod Delete API error: %v", err)
} }
Logf("Wait up to %v for pod %q to be fully deleted", maxWait, podName) Logf("Wait up to %v for pod %q to be fully deleted", PodDeleteTimeout, podName)
err = f.WaitForPodNotFound(podName, maxWait) err = f.WaitForPodNotFound(podName, PodDeleteTimeout)
if err != nil { if err != nil {
return fmt.Errorf("pod %q was not deleted: %v", podName, err) return fmt.Errorf("pod %q was not deleted: %v", podName, err)
} }