Merge pull request #64039 from msau42/automated-cherry-pick-of-#63946-upstream-release-1.10

Automatic merge from submit-queue. [1.10] Automated cherry pick of #63946: Wait for pod deletion instead of termination **What this PR does / why we need it**: cherry pick of #63946: Wait for pod deletion instead of termination **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #63923 **Release note**: ```release-note NONE ```

Merge pull request #64039 from msau42/automated-cherry-pick-of-#63946-upstream-release-1.10
14ef91f1 · Kubernetes Submit Queue · GitHub · 5f82d8c3 · 99483c60 · 14ef91f1
Unverified Commit 14ef91f1 authored May 22, 2018 by Kubernetes Submit Queue Committed by GitHub May 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

util.go test/e2e/framework/util.go +3 -0

BUILD test/e2e/storage/utils/BUILD +0 -1

utils.go test/e2e/storage/utils/utils.go +3 -4

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -113,6 +113,9 @@ const (
 	// TODO: Make this 30 seconds once #4566 is resolved.
 	PodStartTimeout = 5 * time.Minute
+	// How long to wait for a pod to be deleted
+	PodDeleteTimeout = 5 * time.Minute
 	// If there are any orphaned namespaces to clean up, this test is running
 	// on a long lived cluster. A long wait here is preferably to spurious test
 	// failures caused by leaked resources from a previous test run.

--- a/test/e2e/storage/utils/BUILD
+++ b/test/e2e/storage/utils/BUILD
@@ -17,7 +17,6 @@ go_library(
        "//vendor/github.com/onsi/ginkgo:go_default_library",
        "//vendor/github.com/onsi/gomega:go_default_library",
        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
    ],

--- a/test/e2e/storage/utils/utils.go
+++ b/test/e2e/storage/utils/utils.go
@@ -24,7 +24,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/api/core/v1"
-	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -193,9 +192,9 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f
 	By("Starting the kubelet and waiting for pod to delete.")
 	KubeletCommand(KStart, c, clientPod)
-	err = f.WaitForPodTerminated(clientPod.Name, "")
+	err = f.WaitForPodNotFound(clientPod.Name, framework.PodDeleteTimeout)
-	if !apierrs.IsNotFound(err) && err != nil {
+	if err != nil {
-		Expect(err).NotTo(HaveOccurred(), "Expected pod to terminate.")
+		Expect(err).NotTo(HaveOccurred(), "Expected pod to be not found.")
 	}
 	if forceDelete {