github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20202 from caesarxuchao/skip-update

Browse Source 
skip update when deleting with grace-period=0
This commit is contained in:
Jeff Lowdermilk
2016-02-02 18:24:57 -08:00
parent 136c1f9d94 a6d96a04d0
commit ae2aece9af
6 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/pods.go
View File

@@ -343,8 +343,12 @@ var _ = Describe("Pods", func() {
Fail("Timeout while waiting for pod creation")
}
// We need to wait for the pod to be scheduled, otherwise the deletion
// will be carried out immediately rather than gracefully.
expectNoError(framework.WaitForPodRunning(pod.Name))
By("deleting the pod gracefully")
if err := podClient.Delete(pod.Name, nil); err != nil {
if err := podClient.Delete(pod.Name, api.NewDeleteOptions(30)); err != nil {
Failf("Failed to delete pod: %v", err)
}
@@ -352,7 +356,7 @@ var _ = Describe("Pods", func() {
deleted := false
timeout := false
var lastPod *api.Pod
timer := time.After(podStartTimeout)
timer := time.After(30 * time.Second)
for !deleted && !timeout {
select {
case event, _ := <-w.ResultChan():