Check init containers in PodContainerRunning

Sometimes when an init container runs and terminates quickly, PodContainerRunning can go into a state where the pod indicates it's still running, but the container is already terminated. Handle that condition by returning ErrContainerTerminated when it happens.

Check init containers in PodContainerRunning
8530ede6 · Andy Goldstein · b8990593 · 8530ede6
Commit 8530ede6 authored Aug 22, 2016 by Andy Goldstein
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

conditions.go pkg/client/unversioned/conditions.go +9 -0

No files found.
--- a/pkg/client/unversioned/conditions.go
+++ b/pkg/client/unversioned/conditions.go
@@ -238,6 +238,15 @@ func PodContainerRunning(containerName string) watch.ConditionFunc {
 				}
 				return s.State.Running != nil, nil
 			}
+			for _, s := range t.Status.InitContainerStatuses {
+				if s.Name != containerName {
+					continue
+				}
+				if s.State.Terminated != nil {
+					return false, ErrContainerTerminated
+				}
+				return s.State.Running != nil, nil
+			}
 			return false, nil
 		}
 		return false, nil