Merge pull request #16945 from kargakis/kubelet-fallback-to-apiserver

kubelet: Fallback to api server for pod status
This commit is contained in:
Wojciech Tyczynski 2015-11-09 16:12:07 +01:00
commit 8a8f394f0d

View File

@ -2308,7 +2308,10 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName string, lo
}
podStatus, found := kl.statusManager.GetPodStatus(podUID)
if !found {
return fmt.Errorf("failed to get status for pod %q in namespace %q", name, namespace)
// If there is no cached status, use the status from the
// apiserver. This is useful if kubelet has recently been
// restarted.
podStatus = pod.Status
}
if err := kl.validatePodPhase(&podStatus); err != nil {