github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6054 from fgrzadkowski/fix_pod_status

Browse Source 
Do not fail pod status update if failed to get host IP
This commit is contained in:
Victor Marmol 2015-03-27 09:10:44 -07:00
commit e4fc45c26f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet.go
View File

@ -1925,9 +1925,10 @@ func (kl *Kubelet) generatePodStatusByPod(pod *api.Pod) (api.PodStatus, error) {
podStatus.Host = kl.GetHostname() podStatus.Host = kl.GetHostname()
hostIP, err := kl.GetHostIP() hostIP, err := kl.GetHostIP()
if err != nil { if err != nil {
return api.PodStatus{}, fmt.Errorf("Cannot get host IP: %v", err) glog.Errorf("Cannot get host IP: %v", err)
} } else {
podStatus.HostIP = hostIP.String() podStatus.HostIP = hostIP.String()
}
return *podStatus, nil return *podStatus, nil
} }