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

Merge pull request #22483 from yujuhong/force_update

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-04 22:26:14 -08:00
parent 57c944caa2 0264ebdda1
commit 8ba70b573e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/status/manager.go
View File

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