descheduler: allow annotated pod pass non-retrievable filter (#1994)

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com> Co-authored-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
koordinator-sh · Apr 12, 2024 · 2fb6fc4 · 2fb6fc4
1 parent 19c19e0
commit 2fb6fc4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/descheduler/controllers/migration/arbitrator/filter.go b/pkg/descheduler/controllers/migration/arbitrator/filter.go
@@ -137,7 +137,10 @@ func (f *filter) initFilters(args *deschedulerconfig.MigrationControllerArgs, ha
 	f.retryablePodFilter = func(pod *corev1.Pod) bool {
 		return evictionsutil.HaveEvictAnnotation(pod) || retriablePodFilters(pod)
 	}
-	f.nonRetryablePodFilter = podFilter
+	f.nonRetryablePodFilter = func(pod *corev1.Pod) bool {
+		// any annotated as evictable pod pass non-retryable filter
+		return evictionsutil.HaveEvictAnnotation(pod) || podFilter(pod)
+	}
 	f.defaultFilterPlugin = defaultEvictor.(framework.FilterPlugin)
 	return nil
 }