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

Wait for pod deletion instead of termination

Browse Source
This commit is contained in:
Michelle Au 2018-05-16 11:50:15 -07:00
parent 7e75a09db6
commit 46b62c20e4
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/util.go
View File

@ -116,6 +116,9 @@ const (
// minutes by slow docker pulls or something else. // minutes by slow docker pulls or something else.
PodStartShortTimeout = 1 * time.Minute PodStartShortTimeout = 1 * 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 // 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 // on a long lived cluster. A long wait here is preferably to spurious test
// failures caused by leaked resources from a previous test run. // failures caused by leaked resources from a previous test run.

1
test/e2e/storage/utils/BUILD
View File

@ -17,7 +17,6 @@ go_library(
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/api/core/v1: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/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library",
], ],

10
test/e2e/storage/utils/utils.go
View File

@ -24,7 +24,6 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -191,14 +190,11 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f
} }
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Wait for pod to enter "Terminating state"
time.Sleep(30 * time.Second)
By("Starting the kubelet and waiting for pod to delete.") By("Starting the kubelet and waiting for pod to delete.")
KubeletCommand(KStart, c, clientPod) 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 { if forceDelete {