Skip to content

K
k3s
Commit 07d13c1f authored by Łukasz Oleś's avatar Łukasz Oleś
Browse files
Options

Fix kubectl logs for init containers

Related issues: #25818 #27040
parent 10255f8a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/kubelet/kubelet.go
View file @ 07d13c1f
...@@ -2845,6 +2845,10 @@ func (kl *Kubelet) validateContainerLogStatus(podName string, podStatus *api.Pod ...@@ -2845,6 +2845,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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment