From 60855ddf536fd14c9439e4c1e3e25b8d222c583c Mon Sep 17 00:00:00 2001 From: "wangjianyu.wjy" Date: Wed, 10 Apr 2024 16:50:29 +0800 Subject: [PATCH] descheduler: allow annotated pod pass non-retrievable filter Signed-off-by: wangjianyu.wjy --- pkg/descheduler/controllers/migration/arbitrator/filter.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/descheduler/controllers/migration/arbitrator/filter.go b/pkg/descheduler/controllers/migration/arbitrator/filter.go index 715a1b086..89b09fda1 100644 --- a/pkg/descheduler/controllers/migration/arbitrator/filter.go +++ b/pkg/descheduler/controllers/migration/arbitrator/filter.go @@ -137,7 +137,9 @@ 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 { + return evictionsutil.HaveEvictAnnotation(pod) || podFilter(pod) + } f.defaultFilterPlugin = defaultEvictor.(framework.FilterPlugin) return nil }