github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27042 from lukaszo/logs

Browse Source 
Automatic merge from submit-queue

Fix kubectl logs for init containers
This commit is contained in:
k8s-merge-robot
2016-06-17 05:01:04 -07:00
committed by GitHub
parent ce3d7090a2 07d13c1fb4
commit 983b478ff4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet.go
View File

@@ -2720,6 +2720,10 @@ func (kl *Kubelet) validateContainerLogStatus(podName string, podStatus *api.Pod
var cID string var cID string
cStatus, found := api.GetContainerStatus(podStatus.ContainerStatuses, containerName) cStatus, found := api.GetContainerStatus(podStatus.ContainerStatuses, containerName)
// if not found, check the init containers
if !found {
cStatus, found = api.GetContainerStatus(podStatus.InitContainerStatuses, containerName)
}
if !found { if !found {
return kubecontainer.ContainerID{}, fmt.Errorf("container %q in pod %q is not available", containerName, podName) return kubecontainer.ContainerID{}, fmt.Errorf("container %q in pod %q is not available", containerName, podName)
} }