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

Merge pull request #23658 from Random-Liu/fix-termination-message-path

Browse Source 
Fix TerminationMessagePath
This commit is contained in:
Jeff Lowdermilk
2016-04-08 20:54:14 -07:00
parent 347158e520 5dbac3a8b8
commit 1a9cb97bdd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/dockertools/manager.go
View File

@@ -384,7 +384,9 @@ func (dm *DockerManager) inspectContainer(id string, podName, podNamespace strin
terminationMessagePath := containerInfo.TerminationMessagePath terminationMessagePath := containerInfo.TerminationMessagePath
if terminationMessagePath != "" { if terminationMessagePath != "" {
if path, found := iResult.Volumes[terminationMessagePath]; found { for _, mount := range iResult.Mounts {
if mount.Destination == terminationMessagePath {
path := mount.Source
if data, err := ioutil.ReadFile(path); err != nil { if data, err := ioutil.ReadFile(path); err != nil {
message = fmt.Sprintf("Error on reading termination-log %s: %v", path, err) message = fmt.Sprintf("Error on reading termination-log %s: %v", path, err)
} else { } else {
@@ -392,6 +394,7 @@ func (dm *DockerManager) inspectContainer(id string, podName, podNamespace strin
} }
} }
} }
}
status.State = kubecontainer.ContainerStateExited status.State = kubecontainer.ContainerStateExited
status.Message = message status.Message = message
status.Reason = reason status.Reason = reason