Merge pull request #27042 from lukaszo/logs

Automatic merge from submit-queue Fix kubectl logs for init containers

Merge pull request #27042 from lukaszo/logs
983b478f · k8s-merge-robot · GitHub · ce3d7090 · 07d13c1f · 983b478f
Commit 983b478f authored Jun 17, 2016 by k8s-merge-robot Committed by GitHub Jun 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

kubelet.go pkg/kubelet/kubelet.go +4 -0

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -2720,6 +2720,10 @@ func (kl *Kubelet) validateContainerLogStatus(podName string, podStatus *api.Pod
 	var cID string

 	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 {
 		return kubecontainer.ContainerID{}, fmt.Errorf("container %q in pod %q is not available", containerName, podName)
 	}