From 2f79d75b7a585b376247a0af98f4f8bf0eaefaa6 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Thu, 22 Mar 2018 12:21:45 -0400 Subject: [PATCH] Do not consider pods being deleted in the same namespace for spreading purposes for service anti-affinity priority similar to selectorspread priority. --- pkg/scheduler/algorithm/priorities/selector_spreading.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/scheduler/algorithm/priorities/selector_spreading.go b/pkg/scheduler/algorithm/priorities/selector_spreading.go index 7139728808e..8dd41251a8e 100644 --- a/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -211,7 +211,9 @@ func filteredPod(namespace string, selector labels.Selector, nodeInfo *scheduler return []*v1.Pod{} } for _, pod := range nodeInfo.Pods() { - if namespace == pod.Namespace && selector.Matches(labels.Set(pod.Labels)) { + // Ignore pods being deleted for spreading purposes + // Similar to how it is done for SelectorSpreadPriority + if namespace == pod.Namespace && pod.DeletionTimestamp == nil && selector.Matches(labels.Set(pod.Labels)) { pods = append(pods, pod) } }