From 9ef35289e4dbb355dae36f3c67f86e388703abac Mon Sep 17 00:00:00 2001
From: Alexander Brand <abrand@apprenda.com>
Date: Tue, 25 Oct 2016 11:49:05 -0400
Subject: [PATCH] Restore check when getting container IP

---
 pkg/kubelet/dockertools/docker_manager.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go
index c91b9c09b58..a3e52bff3aa 100644
--- a/pkg/kubelet/dockertools/docker_manager.go
+++ b/pkg/kubelet/dockertools/docker_manager.go
@@ -422,11 +422,13 @@ func (dm *DockerManager) inspectContainer(id string, podName, podNamespace strin
 		// Container that are running, restarting and paused
 		status.State = kubecontainer.ContainerStateRunning
 		status.StartedAt = startedAt
-		ip, err = dm.determineContainerIP(podNamespace, podName, iResult)
-		// Kubelet doesn't handle the network error scenario
-		if err != nil {
-			status.State = kubecontainer.ContainerStateUnknown
-			status.Message = fmt.Sprintf("Network error: %#v", err)
+		if containerProvidesPodIP(dockerName) {
+			ip, err = dm.determineContainerIP(podNamespace, podName, iResult)
+			// Kubelet doesn't handle the network error scenario
+			if err != nil {
+				status.State = kubecontainer.ContainerStateUnknown
+				status.Message = fmt.Sprintf("Network error: %#v", err)
+			}
 		}
 		return &status, ip, nil
 	}