github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38189 from feiskyer/fix-attach

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36543, 38189, 38289, 38291, 36724)

Kubelet: only check podUID when it is actually set

Fixes #38188.

cc/ @timstclair @yujuhong
This commit is contained in:
Kubernetes Submit Queue
2016-12-07 11:40:16 -08:00
committed by GitHub
parent f210c97eea 1140d31d9b
commit 28dc2f74ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_pods.go
View File

@@ -1357,7 +1357,7 @@ func (kl *Kubelet) GetAttach(podFullName string, podUID types.UID, containerName
// since whether the process is running in a TTY cannot be changed after it has started. We
// need the api.Pod to get the TTY status.
pod, found := kl.GetPodByFullName(podFullName)
if !found || pod.UID != podUID {
if !found || (string(podUID) != "" && pod.UID != podUID) {
return nil, fmt.Errorf("pod %s not found", podFullName)
}
containerSpec := kubecontainer.GetContainerSpec(pod, containerName)