Merge pull request #6054 from fgrzadkowski/fix_pod_status

Do not fail pod status update if failed to get host IP

Merge pull request #6054 from fgrzadkowski/fix_pod_status
e4fc45c2 · Victor Marmol · bec98277 · fe2f7f25 · e4fc45c2
Commit e4fc45c2 authored Mar 27, 2015 by Victor Marmol
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

kubelet.go pkg/kubelet/kubelet.go +3 -2

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -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
 }