github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: revert the status HostIP behavior

Browse Source
This commit is contained in:
JulienBalestra
2018-02-14 23:38:09 +01:00
parent 6535c955bf
commit 2130f5bc55
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/kubelet_pods.go
View File

@@ -1382,15 +1382,18 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
Status: v1.ConditionTrue, Status: v1.ConditionTrue,
}) })
hostIP, err := kl.getHostIPAnyWay() if kl.kubeClient != nil {
if err != nil { hostIP, err := kl.getHostIPAnyWay()
glog.V(4).Infof("Cannot get host IP: %v", err) if err != nil {
return *s glog.V(4).Infof("Cannot get host IP: %v", err)
} } else {
s.HostIP = hostIP.String() s.HostIP = hostIP.String()
if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" { if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
s.PodIP = hostIP.String() s.PodIP = hostIP.String()
}
}
} }
return *s return *s
} }