From 6c0e35d7b23cbee3d0d68544402f5ee531567628 Mon Sep 17 00:00:00 2001 From: daihao Date: Thu, 13 Jun 2019 17:47:52 +0800 Subject: [PATCH] do not delete pods whose deletiontimestamp != nil --- pkg/controller/daemon/daemon_controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go index 11fc71eb598..96cbcd3b6d2 100644 --- a/pkg/controller/daemon/daemon_controller.go +++ b/pkg/controller/daemon/daemon_controller.go @@ -934,6 +934,9 @@ func (dsc *DaemonSetsController) podsShouldBeOnNode( case !shouldContinueRunning && exists: // If daemon pod isn't supposed to run on node, but it is, delete all daemon pods on node. for _, pod := range daemonPods { + if pod.DeletionTimestamp != nil { + continue + } podsToDelete = append(podsToDelete, pod.Name) } }