github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42779 from dashpole/fix_status

Browse Source 
[Bug Fix] Allow Status Updates for Pods that can be deleted
This commit is contained in:
Dawn Chen 2017-03-09 13:23:00 -08:00 committed by GitHub
commit 69eaea2fcc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/status/status_manager.go
View File

@ -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) {
// 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 {