UPSTREAM: 31150: Check init containers in PodContainerRunning

Andy Goldstein · smarterclayton · commit daacdccda301 · 2016-09-13T12:35:33.000-04:00
:100644 100644 143fd4c... a83c3fe... M	pkg/client/unversioned/conditions.go
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,15 @@ func PodContainerRunning(containerName string) watch.ConditionFunc {`
`238`	`238`	`}`
`239`	`239`	`return s.State.Running != nil, nil`
`240`	`240`	`}`
	`241`	`+ for _, s := range t.Status.InitContainerStatuses {`
	`242`	`+ if s.Name != containerName {`
	`243`	`+ continue`
	`244`	`+ }`
	`245`	`+ if s.State.Terminated != nil {`
	`246`	`+ return false, ErrContainerTerminated`
	`247`	`+ }`
	`248`	`+ return s.State.Running != nil, nil`
	`249`	`+ }`
`241`	`250`	`return false, nil`
`242`	`251`	`}`
`243`	`252`	`return false, nil`