From 8ee2dc88f286487971990cbf35aa9a51bdb60966 Mon Sep 17 00:00:00 2001 From: bindata-mockuser Date: Tue, 9 Aug 2016 16:51:55 -0700 Subject: [PATCH] Container deletion should still happen when pod is removed from pod manager --- pkg/kubelet/kubelet.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 206ed89e9aa..242ebf72086 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2188,14 +2188,13 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle case e := <-plegCh: if isSyncPodWorthy(e) { // PLEG event for a pod; sync it. - pod, ok := kl.podManager.GetPodByUID(e.ID) - if !ok { + if pod, ok := kl.podManager.GetPodByUID(e.ID); ok { + glog.V(2).Infof("SyncLoop (PLEG): %q, event: %#v", format.Pod(pod), e) + handler.HandlePodSyncs([]*api.Pod{pod}) + } else { // If the pod no longer exists, ignore the event. glog.V(4).Infof("SyncLoop (PLEG): ignore irrelevant event: %#v", e) - break } - glog.V(2).Infof("SyncLoop (PLEG): %q, event: %#v", format.Pod(pod), e) - handler.HandlePodSyncs([]*api.Pod{pod}) } if e.Type == pleg.ContainerDied {