From b7292f66724cc2a7ea180c2a995f3dcec58908d0 Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Tue, 9 Feb 2016 18:28:26 -0800 Subject: [PATCH] Add missing PodSyncResult in KillPod --- pkg/kubelet/dockertools/manager.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 0576714616..658fd6de7b 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -1202,7 +1202,9 @@ func (dm *DockerManager) killPodWithSyncResult(pod *api.Pod, runningPod kubecont if networkContainer != nil { ins, err := dm.client.InspectContainer(networkContainer.ID.ID) 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 } if ins.HostConfig != nil && ins.HostConfig.NetworkMode != namespaceModeHost {