Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Merge pull request #1446 from googs1025/fix_filter

Browse Source 
fix: return the unmatched cases first
This commit is contained in:
Kubernetes Prow Robot
2024-06-24 23:53:40 -07:00
committed by GitHub
parent cdbd101eae 6fdee47cbc
commit 85837b1063
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 {
if o.filter != nil && !o.filter(pod) {
return false
}
if len(o.includedNamespaces) > 0 && !o.includedNamespaces.Has(pod.Namespace) {
return false
}
@@ -111,6 +108,9 @@ func (o *Options) BuildFilterFunc() (FilterFunc, error) {
if s != nil && !s.Matches(labels.Set(pod.GetLabels())) {
return false
}
if o.filter != nil && !o.filter(pod) {
return false
}
return true
}, nil
}