Commit e3e0bc6c authored by David Ashpole's avatar David Ashpole

do not skip pods that can be deleted

parent 24d84fa3
...@@ -393,7 +393,7 @@ func (m *manager) syncBatch() { ...@@ -393,7 +393,7 @@ func (m *manager) syncBatch() {
} }
syncedUID = mirrorUID syncedUID = mirrorUID
} }
if m.needsUpdate(syncedUID, status) || m.couldBeDeleted(uid, status.status) { if m.needsUpdate(syncedUID, status) {
updatedStatuses = append(updatedStatuses, podStatusSyncRequest{uid, status}) updatedStatuses = append(updatedStatuses, podStatusSyncRequest{uid, status})
} else if m.needsReconcile(uid, status.status) { } else if m.needsReconcile(uid, status.status) {
// Delete the apiStatusVersions here to force an update on the pod 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) { ...@@ -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. // 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 { func (m *manager) needsUpdate(uid types.UID, status versionedPodStatus) bool {
latest, ok := m.apiStatusVersions[uid] 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 { func (m *manager) couldBeDeleted(uid types.UID, status v1.PodStatus) bool {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment