From 07d13c1fb4eade060945305f370370113ff84e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Wed, 8 Jun 2016 14:03:51 +0200 Subject: [PATCH] Fix kubectl logs for init containers Related issues: #25818 #27040 --- pkg/kubelet/kubelet.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 8b8e14cd953..4d02c51071a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2845,6 +2845,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) }