Commit 8ba70b57 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #22483 from yujuhong/force_update

Auto commit by PR queue bot
parents 57c944ca 0264ebdd
...@@ -148,7 +148,10 @@ func (m *manager) SetPodStatus(pod *api.Pod, status api.PodStatus) { ...@@ -148,7 +148,10 @@ func (m *manager) SetPodStatus(pod *api.Pod, status api.PodStatus) {
if err != nil { if err != nil {
return 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) { func (m *manager) SetContainerReadiness(podUID types.UID, containerID kubecontainer.ContainerID, ready 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