From 6fdee47cbc49ec791baa20260cb084ac49847c18 Mon Sep 17 00:00:00 2001
From: googs1025 <googs1025@gmail.com>
Date: Sat, 22 Jun 2024 18:16:40 +0800
Subject: [PATCH] fix: return the unmatched cases first, then perform the
 eviction

---
 pkg/descheduler/pod/pods.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/descheduler/pod/pods.go b/pkg/descheduler/pod/pods.go
index e1aa8656b..1e7ef289b 100644
--- a/pkg/descheduler/pod/pods.go
+++ b/pkg/descheduler/pod/pods.go
@@ -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
 }