Skip to content

K
k3s
Commit 9ebaf292 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30624 from derekwaynecarr/node-controller-fix

Automatic merge from submit-queue Node controller deletePod return true if there are pods pending deletion Fixes https://github.com/kubernetes/kubernetes/issues/30536 If a node had a single pod in terminating state, and that node no longer reported healthy, the pod was never deleted by the node controller because it believed there were no pods remaining. @smarterclayton @ncdc
parents 68c4190e 14a2b261
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/controller/node/controller_utils.go
View file @ 9ebaf292
...@@ -57,7 +57,7 @@ func cleanupOrphanedPods(pods []*api.Pod, nodeStore cache.Store, forcefulDeleteP ...@@ -57,7 +57,7 @@ func cleanupOrphanedPods(pods []*api.Pod, nodeStore cache.Store, forcefulDeleteP
} }
// deletePods will delete all pods from master running on given node, and return true // deletePods will delete all pods from master running on given node, and return true
// if any pods were deleted. // if any pods were deleted, or were found pending deletion.
func deletePods(kubeClient clientset.Interface, recorder record.EventRecorder, nodeName, nodeUID string, daemonStore cache.StoreToDaemonSetLister) (bool, error) { func deletePods(kubeClient clientset.Interface, recorder record.EventRecorder, nodeName, nodeUID string, daemonStore cache.StoreToDaemonSetLister) (bool, error) {
remaining := false remaining := false
selector := fields.OneTermEqualSelector(api.PodHostField, nodeName) selector := fields.OneTermEqualSelector(api.PodHostField, nodeName)
...@@ -76,8 +76,9 @@ func deletePods(kubeClient clientset.Interface, recorder record.EventRecorder, n ...@@ -76,8 +76,9 @@ func deletePods(kubeClient clientset.Interface, recorder record.EventRecorder, n
if pod.Spec.NodeName != nodeName { if pod.Spec.NodeName != nodeName {
continue continue
} }
// if the pod has already been deleted, ignore it // if the pod has already been marked for deletion, we still return true that there are remaining pods.
if pod.DeletionGracePeriodSeconds != nil { if pod.DeletionGracePeriodSeconds != nil {
remaining = true
continue continue
} }
// if the pod is managed by a daemonset, ignore it // if the pod is managed by a daemonset, ignore it
......
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