From 02b1e8b8b9c1f08d1e8b00e668e66a0fadb9b81e Mon Sep 17 00:00:00 2001 From: lucming <2876757716@qq.com> Date: Thu, 16 Feb 2023 17:25:00 +0800 Subject: [PATCH] remove some logic useless --- .../plugins/removepodsviolatingnodetaints/node_taint.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go b/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go index a9eee7b8a..6960bb43b 100644 --- a/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go +++ b/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go @@ -105,7 +105,6 @@ func (d *RemovePodsViolatingNodeTaints) Deschedule(ctx context.Context, nodes [] } } totalPods := len(pods) - skipNode := false for i := 0; i < totalPods; i++ { if !utils.TolerationsTolerateTaintsWithFilter( pods[i].Spec.Tolerations, @@ -115,14 +114,11 @@ func (d *RemovePodsViolatingNodeTaints) Deschedule(ctx context.Context, nodes [] klog.V(2).InfoS("Not all taints with NoSchedule effect are tolerated after update for pod on node", "pod", klog.KObj(pods[i]), "node", klog.KObj(node)) d.handle.Evictor().Evict(ctx, pods[i], evictions.EvictOptions{}) if d.handle.Evictor().NodeLimitExceeded(node) { - skipNode = true break } } } - if skipNode { - continue - } } + return nil }