Skip to content

K
k3s
Unverified Commit 95eea8a8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66005 from Random-Liu/automated-cherry-pick-of-#65987-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #65987: Fix pod worker deadlock. Cherry pick of #65987 on release-1.10. #65987: Fix pod worker deadlock.
parents 4c7141ca 9ca42278
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/pod_workers.go
View file @ 95eea8a8
...@@ -306,7 +306,7 @@ func killPodNow(podWorkers PodWorkers, recorder record.EventRecorder) eviction.K ...@@ -306,7 +306,7 @@ func killPodNow(podWorkers PodWorkers, recorder record.EventRecorder) eviction.K
type response struct { type response struct {
err error err error
} }
ch := make(chan response) ch := make(chan response, 1)
podWorkers.UpdatePod(&UpdatePodOptions{ podWorkers.UpdatePod(&UpdatePodOptions{
Pod: pod, Pod: pod,
UpdateType: kubetypes.SyncPodKill, UpdateType: kubetypes.SyncPodKill,
......
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