github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix returning logs from ephemeral containers

Browse Source
This commit is contained in:
Lee Verberne 2019-08-20 17:45:38 +00:00
parent b5d592e735
commit cb3976c02b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet_pods.go
View File

@ -1108,10 +1108,12 @@ func (kl *Kubelet) validateContainerLogStatus(podName string, podStatus *v1.PodS
var cID string var cID string
cStatus, found := podutil.GetContainerStatus(podStatus.ContainerStatuses, containerName) cStatus, found := podutil.GetContainerStatus(podStatus.ContainerStatuses, containerName)
// if not found, check the init containers
if !found { if !found {
cStatus, found = podutil.GetContainerStatus(podStatus.InitContainerStatuses, containerName) cStatus, found = podutil.GetContainerStatus(podStatus.InitContainerStatuses, containerName)
} }
if !found && utilfeature.DefaultFeatureGate.Enabled(features.EphemeralContainers) {
cStatus, found = podutil.GetContainerStatus(podStatus.EphemeralContainerStatuses, 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)
} }