From 2130f5bc550854e2e88a8faaf1048abaee3c740c Mon Sep 17 00:00:00 2001
From: JulienBalestra <julien.balestra@gmail.com>
Date: Wed, 14 Feb 2018 23:38:09 +0100
Subject: [PATCH] kubelet: revert the status HostIP behavior

---
 pkg/kubelet/kubelet_pods.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go
index 54a6eeff36f..506109ede07 100644
--- a/pkg/kubelet/kubelet_pods.go
+++ b/pkg/kubelet/kubelet_pods.go
@@ -1382,15 +1382,18 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
 		Status: v1.ConditionTrue,
 	})
 
-	hostIP, err := kl.getHostIPAnyWay()
-	if err != nil {
-		glog.V(4).Infof("Cannot get host IP: %v", err)
-		return *s
-	}
-	s.HostIP = hostIP.String()
-	if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
-		s.PodIP = hostIP.String()
+	if kl.kubeClient != nil {
+		hostIP, err := kl.getHostIPAnyWay()
+		if err != nil {
+			glog.V(4).Infof("Cannot get host IP: %v", err)
+		} else {
+			s.HostIP = hostIP.String()
+			if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
+				s.PodIP = hostIP.String()
+			}
+		}
 	}
+
 	return *s
 }