github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet.go
View File

@ -2308,7 +2308,10 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName string, lo
} }
podStatus, found := kl.statusManager.GetPodStatus(podUID) podStatus, found := kl.statusManager.GetPodStatus(podUID)
if !found { 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 { if err := kl.validatePodPhase(&podStatus); err != nil {