github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6609 from yifan-gu/fix_getpodstatus 

kubelet/DockerManager: Fix returning empty error from GetPodStatus().
pull/6/head
Vish Kannan 2015-04-08 18:08:11 -07:00
parent 844e375ceb d4513c2890
commit 3a3d860448
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/dockertools/manager.go
View File

@ -219,7 +219,7 @@ func (self *DockerManager) GetPodStatus(pod *api.Pod) (*api.PodStatus, error) {
result := self.inspectContainer(value.ID, dockerContainerName, terminationMessagePath)
if result.err != nil {
return nil, err
return nil, result.err
}
// Add user container information