Merge pull request #68074 from mkimuram/issue/68073

Automatic merge from submit-queue (batch tested with PRs 67368, 59930, 68074). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Fix subpath tests not to fail in namespace deletion **What this PR does / why we need it**: This PR fixes below subpath test not to fail in namespace deletion - subPath should support restarting containers using directory as subpath - subPath should support restarting containers using file as subpath **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: #68073 **Special notes for your reviewer**: /sig storage /sig testing **Release note**: ```release-note NONE ```

Merge pull request #68074 from mkimuram/issue/68073
90fed8e2 · Kubernetes Submit Queue · GitHub · cfdefff3 · 69b9cf5c · 90fed8e2
Unverified Commit 90fed8e2 authored Aug 30, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

subpath.go test/e2e/storage/testsuites/subpath.go +3 -1

No files found.
--- a/test/e2e/storage/testsuites/subpath.go
+++ b/test/e2e/storage/testsuites/subpath.go
@@ -589,7 +589,9 @@ func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
 	By(fmt.Sprintf("Creating pod %s", pod.Name))
 	pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
 	Expect(err).ToNot(HaveOccurred(), "while creating pod")
-
+	defer func() {
+		framework.DeletePodWithWait(f, f.ClientSet, pod)
+	}()
 	err = framework.WaitForPodRunningInNamespace(f.ClientSet, pod)
 	Expect(err).ToNot(HaveOccurred(), "while waiting for pod to be running")