Merge pull request kubernetes#6029 from vishh/1726

Update pod ip using active container only.
duda · Mar 27, 2015 · 13ae406 · 13ae406
2 parents f2c7dda + 14a48ad
commit 13ae406
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go
@@ -676,15 +676,20 @@ func GetDockerPodStatus(client DockerInterface, manifest api.PodSpec, podFullNam
 		if result.err != nil {
 			return nil, err
 		}
+
 		// Add user container information
-		if dockerContainerName == PodInfraContainerName {
+		if dockerContainerName == PodInfraContainerName &&
+			result.status.State.Running != nil {
 			// Found network container
 			podStatus.PodIP = result.ip
 		} else {
 			statuses[dockerContainerName] = result.status
 		}
 	}
 
+	if podStatus.PodIP == "" {
+		return nil, ErrNoPodInfraContainerInPod
+	}
 	if len(statuses) == 0 && podStatus.PodIP == "" {
 		return nil, ErrNoContainersInPod
 	}