Merge pull request #36308 from kargakis/not-found-fix

Automatic merge from submit-queue test: ignore 404 when deleting pods Fixes https://github.com/kubernetes/kubernetes/issues/36265 @kubernetes/deployment

Merge pull request #36308 from kargakis/not-found-fix
30132658 · Kubernetes Submit Queue · GitHub · 7bc35868 · e7158d8e · 30132658
Commit 30132658 authored Nov 07, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

deployment.go test/e2e/deployment.go +4 -1

No files found.
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -1444,7 +1444,10 @@ func testIterativeDeployments(f *framework.Framework) {
 				}
 				name := podList.Items[p].Name
 				framework.Logf("%02d: deleting deployment pod %q", i, name)
-				Expect(c.Core().Pods(ns).Delete(name, nil)).NotTo(HaveOccurred())
+				err := c.Core().Pods(ns).Delete(name, nil)
+				if err != nil && !errors.IsNotFound(err) {
+					Expect(err).NotTo(HaveOccurred())
+				}
 			}
 		}
 	}