Merge pull request #6054 from fgrzadkowski/fix_pod_status

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

View File

@ -1925,9 +1925,10 @@ func (kl *Kubelet) generatePodStatusByPod(pod *api.Pod) (api.PodStatus, error) {
podStatus.Host = kl.GetHostname()
hostIP, err := kl.GetHostIP()
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
}