github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10048 from rajatchopra/master

Browse Source 
Assign host's IPAddress to podIP when pod shares the host's network
This commit is contained in:
Satnam Singh 2015-06-19 08:16:24 -07:00
commit e584629272
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -2170,6 +2170,9 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod) (api.PodStatus, error) {
glog.V(4).Infof("Cannot get host IP: %v", err) glog.V(4).Infof("Cannot get host IP: %v", err)
} else { } else {
podStatus.HostIP = hostIP.String() podStatus.HostIP = hostIP.String()
if pod.Spec.HostNetwork && podStatus.PodIP == "" {
podStatus.PodIP = hostIP.String()
}
} }
} }