github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kubelet: only check podUID when it is actually set

Browse Source
This commit is contained in:
Pengfei Ni 2016-12-06 19:49:55 +08:00
parent 6a1d0f0b7b
commit 1140d31d9b
1 changed files with 1 additions and 1 deletions
Show Stats 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 // 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. // need the api.Pod to get the TTY status.
pod, found := kl.GetPodByFullName(podFullName) 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) return nil, fmt.Errorf("pod %s not found", podFullName)
} }
containerSpec := kubecontainer.GetContainerSpec(pod, containerName) containerSpec := kubecontainer.GetContainerSpec(pod, containerName)