Merge pull request #6652 from dchen1107/podstatus

Populate last terminated container information
This commit is contained in:
Victor Marmol
2015-04-10 09:21:58 -07:00
3 changed files with 150 additions and 6 deletions

View File

@@ -1987,6 +1987,7 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod) (api.PodStatus, error) {
}
}
podStatus.Conditions = append(podStatus.Conditions, getPodReadyCondition(spec, podStatus.ContainerStatuses)...)
hostIP, err := kl.GetHostIP()
if err != nil {
glog.Errorf("Cannot get host IP: %v", err)