Merge pull request #6129 from yujuhong/container_status

Kubelet: allow docker to examine terminated container

Merge pull request #6129 from yujuhong/container_status
296fafa9 · Dawn Chen · 525bbfd1 · 3ad0e22c · 296fafa9
Commit 296fafa9 authored Mar 27, 2015 by Dawn Chen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

docker.go pkg/kubelet/dockertools/docker.go +0 -3

No files found.
--- a/pkg/kubelet/dockertools/docker.go
+++ b/pkg/kubelet/dockertools/docker.go
@@ -687,9 +687,6 @@ func GetDockerPodStatus(client DockerInterface, manifest api.PodSpec, podFullNam
 		}
 	}

-	if podStatus.PodIP == "" {
-		return nil, ErrNoPodInfraContainerInPod
-	}
 	if len(statuses) == 0 && podStatus.PodIP == "" {
 		return nil, ErrNoContainersInPod
 	}