From cb3976c02ba5040fe4194d39f34045038caff28e Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Tue, 20 Aug 2019 17:45:38 +0000 Subject: [PATCH] Fix returning logs from ephemeral containers --- pkg/kubelet/kubelet_pods.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index d59828aaa37..bab117f6178 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -1108,10 +1108,12 @@ func (kl *Kubelet) validateContainerLogStatus(podName string, podStatus *v1.PodS var cID string cStatus, found := podutil.GetContainerStatus(podStatus.ContainerStatuses, containerName) - // if not found, check the init containers if !found { cStatus, found = podutil.GetContainerStatus(podStatus.InitContainerStatuses, containerName) } + if !found && utilfeature.DefaultFeatureGate.Enabled(features.EphemeralContainers) { + cStatus, found = podutil.GetContainerStatus(podStatus.EphemeralContainerStatuses, containerName) + } if !found { return kubecontainer.ContainerID{}, fmt.Errorf("container %q in pod %q is not available", containerName, podName) }