From e3e0bc6ce05613bf32c772a7b14a8cab194d3a64 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Thu, 9 Mar 2017 09:35:50 -0800 Subject: [PATCH] do not skip pods that can be deleted --- pkg/kubelet/status/status_manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index ab52734f2a3..37794354593 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -393,7 +393,7 @@ func (m *manager) syncBatch() { } syncedUID = mirrorUID } - if m.needsUpdate(syncedUID, status) || m.couldBeDeleted(uid, status.status) { + if m.needsUpdate(syncedUID, status) { updatedStatuses = append(updatedStatuses, podStatusSyncRequest{uid, status}) } else if m.needsReconcile(uid, status.status) { // Delete the apiStatusVersions here to force an update on the pod status @@ -469,7 +469,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) { // This method is not thread safe, and most only be accessed by the sync thread. func (m *manager) needsUpdate(uid types.UID, status versionedPodStatus) bool { latest, ok := m.apiStatusVersions[uid] - return !ok || latest < status.version + return !ok || latest < status.version || m.couldBeDeleted(uid, status.status) } func (m *manager) couldBeDeleted(uid types.UID, status v1.PodStatus) bool {