Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 06:29:29 +01:00
Code Packages Releases Activity

fix: return the unmatched cases first, then perform the eviction

Browse Source
This commit is contained in:
googs1025
2024-06-22 18:16:40 +08:00
parent cdbd101eae
commit 6fdee47cbc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/descheduler/pod/pods.go
View File

@@ -99,9 +99,6 @@ func (o *Options) BuildFilterFunc() (FilterFunc, error) {
} }
} }
return func(pod *v1.Pod) bool { return func(pod *v1.Pod) bool {
if o.filter != nil && !o.filter(pod) {
return false
}
if len(o.includedNamespaces) > 0 && !o.includedNamespaces.Has(pod.Namespace) { if len(o.includedNamespaces) > 0 && !o.includedNamespaces.Has(pod.Namespace) {
return false return false
} }
@@ -111,6 +108,9 @@ func (o *Options) BuildFilterFunc() (FilterFunc, error) {
if s != nil && !s.Matches(labels.Set(pod.GetLabels())) { if s != nil && !s.Matches(labels.Set(pod.GetLabels())) {
return false return false
} }
if o.filter != nil && !o.filter(pod) {
return false
}
return true return true
}, nil }, nil
} }