github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59484 from verb/debug-kubelet-1

Browse Source 
Add support for Ephemeral Containers to the kubelet
This commit is contained in:
Kubernetes Prow Robot
2019-08-21 00:29:17 -07:00
committed by GitHub
parent 0dfb87dfa5 cb3976c02b
commit 59d29b67d9
11 changed files with 375 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/server/server.go
View File

@@ -555,22 +555,7 @@ func (s *Server) getContainerLogs(request *restful.Request, response *restful.Re
return
}
// Check if containerName is valid.
containerExists := false
for _, container := range pod.Spec.Containers {
if container.Name == containerName {
containerExists = true
break
}
}
if !containerExists {
for _, container := range pod.Spec.InitContainers {
if container.Name == containerName {
containerExists = true
break
}
}
}
if !containerExists {
if kubecontainer.GetContainerSpec(pod, containerName) == nil {
response.WriteError(http.StatusNotFound, fmt.Errorf("container %q not found in pod %q", containerName, podID))
return
}