github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16191 from yujuhong/fix_logs

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-26 09:31:35 -07:00
parent dbf9a53de9 e4f739115f
commit bffdd242d8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet.go
View File

@@ -2223,7 +2223,11 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName string, lo
return fmt.Errorf("unable to get logs for container %q in pod %q namespace %q: unable to find pod", containerName, name, namespace)
}
podStatus, found := kl.statusManager.GetPodStatus(pod.UID)
podUID := pod.UID
if mirrorPod, ok := kl.podManager.GetMirrorPodByPod(pod); ok {
podUID = mirrorPod.UID
}
podStatus, found := kl.statusManager.GetPodStatus(podUID)
if !found {
return fmt.Errorf("failed to get status for pod %q in namespace %q", name, namespace)
}