Merge pull request #64400 from soltysh/fix_kubecl_rc

Automatic merge from submit-queue. Add retry to AssertCleanup **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: This addresses the other two problems mentioned in https://github.com/kubernetes/kubernetes/issues/64362 by cherry-picking https://github.com/kubernetes/kubernetes/pull/61565 and https://github.com/kubernetes/kubernetes/pull/62155 on to 1.10 release. **Release note**: ```release-note NONE ```

Merge pull request #64400 from soltysh/fix_kubecl_rc
c5f46f9e · Kubernetes Submit Queue · GitHub · 04209a91 · 8819dee4 · c5f46f9e
Unverified Commit c5f46f9e authored May 28, 2018 by Kubernetes Submit Queue Committed by GitHub May 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

util.go test/e2e/framework/util.go +20 -8

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -2079,15 +2079,27 @@ func AssertCleanup(ns string, selectors ...string) {
 	if ns != "" {
 		nsArg = fmt.Sprintf("--namespace=%s", ns)
 	}
-	for _, selector := range selectors {
-		resources := RunKubectlOrDie("get", "rc,svc", "-l", selector, "--no-headers", nsArg)
+	var e error
-		if resources != "" {
+	verifyCleanupFunc := func() (bool, error) {
-			Failf("Resources left running after stop:\n%s", resources)
+		e = nil
-		}
+		for _, selector := range selectors {
-		pods := RunKubectlOrDie("get", "pods", "-l", selector, nsArg, "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}{{ \"\\n\" }}{{ end }}{{ end }}")
+			resources := RunKubectlOrDie("get", "rc,svc", "-l", selector, "--no-headers", nsArg)
-		if pods != "" {
+			if resources != "" {
-			Failf("Pods left unterminated after stop:\n%s", pods)
+				e = fmt.Errorf("Resources left running after stop:\n%s", resources)
+				return false, nil
+			}
+			pods := RunKubectlOrDie("get", "pods", "-l", selector, nsArg, "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}{{ \"\\n\" }}{{ end }}{{ end }}")
+			if pods != "" {
+				e = fmt.Errorf("Pods left unterminated after stop:\n%s", pods)
+				return false, nil
+			}
 		}
+		return true, nil
+	}
+	err := wait.PollImmediate(500*time.Millisecond, 1*time.Minute, verifyCleanupFunc)
+	if err != nil {
+		Failf(e.Error())
 	}
 }