waitForPodDeletion returns nil when pod is successfully removed

openshift · Jun 3, 2019 · abb16d4 · abb16d4
1 parent 93f52a7
commit abb16d4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/steps/template.go b/pkg/steps/template.go
@@ -471,7 +471,8 @@ func waitForPodDeletion(podClient coreclientset.PodInterface, name string, uid t
 	// Wait for pod to be completed
 	for i := 0; i < timeout; i += 2 {
 		if _, err := checkPodExists(podClient, name, uid); err != nil {
-			return err
+			// non-nil err means pod is now gone, so waitForPodDeletion returns `nil` here
+			return nil
 		}
 		log.Printf("Waiting for pod %s to be deleted ... (%ds/%d)", name, i, timeout)
 		time.Sleep(2 * time.Second)