From 0264ebdda19ec5edcb2dc86f7aaf67ae01fac5b8 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Thu, 3 Mar 2016 16:24:56 -0800 Subject: [PATCH] kubelet: force status update when the deletion timestamp is set --- pkg/kubelet/status/manager.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/status/manager.go b/pkg/kubelet/status/manager.go index 20d2df64b5a..5503a5dcaaf 100644 --- a/pkg/kubelet/status/manager.go +++ b/pkg/kubelet/status/manager.go @@ -148,7 +148,10 @@ func (m *manager) SetPodStatus(pod *api.Pod, status api.PodStatus) { if err != nil { return } - m.updateStatusInternal(pod, status, false) + // Force a status update if deletion timestamp is set. This is necessary + // because if the pod is in the non-running state, the pod worker still + // needs to be able to trigger an update and/or deletion. + m.updateStatusInternal(pod, status, pod.DeletionTimestamp != nil) } func (m *manager) SetContainerReadiness(podUID types.UID, containerID kubecontainer.ContainerID, ready bool) {