fix: serialize pod add/delete order

(cherry picked from commit edaf41e0)

fix: serialize pod add/delete order
(cherry picked from commit edaf41e0)
765ede7b · Mengxin Liu · oilbeater · 78dc1fbf · 765ede7b
Commit 765ede7b authored 3 years ago by Mengxin Liu Committed by oilbeater 3 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/pkg/controller/pod.go
+++ b/pkg/controller/pod.go
@@ -536,7 +536,8 @@ func (c *Controller) handleDeletePod(pod *v1.Pod) error {
 	c.podKeyMutex.Lock(key)
 	defer c.podKeyMutex.Unlock(key)

-	if pod != nil && pod.DeletionTimestamp == nil && isPodAlive(pod) {
+	p, _ := c.podsLister.Pods(pod.Namespace).Get(pod.Name)
+	if p != nil && p.UID != pod.UID {
 		// Pod with same name exists, just return here
 		return nil
 	}