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

Merge pull request #20954 from Random-Liu/add-missing-pod-sync-result

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-13 20:02:31 -08:00
parent d6b4ff3884 b7292f6672
commit 24b33964c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1216,7 +1216,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 {