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

Add missing PodSyncResult in KillPod

pull/6/head
Random-Liu 2016-02-09 18:28:26 -08:00
parent f0620a5efd
commit b7292f6672
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1202,7 +1202,9 @@ func (dm *DockerManager) killPodWithSyncResult(pod *api.Pod, runningPod kubecont
if networkContainer != nil { if networkContainer != nil {
ins, err := dm.client.InspectContainer(networkContainer.ID.ID) ins, err := dm.client.InspectContainer(networkContainer.ID.ID)
if err != nil { if err != nil {
glog.Errorf("Error inspecting container %v: %v", networkContainer.ID.ID, err) err = fmt.Errorf("Error inspecting container %v: %v", networkContainer.ID.ID, err)
glog.Error(err)
result.Fail(err)
return return
} }
if ins.HostConfig != nil && ins.HostConfig.NetworkMode != namespaceModeHost { if ins.HostConfig != nil && ins.HostConfig.NetworkMode != namespaceModeHost {