Merge pull request #1358 from tioxy/fix_metrics_evictoptions

k8s-ci-robot · web-flow · commit a5f322521e3a · 2024-03-04T05:40:44.000-08:00
Fix node taint wrong EvictOption field
diff --git a/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go b/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go
@@ -112,7 +112,7 @@ func (d *RemovePodsViolatingNodeTaints) Deschedule(ctx context.Context, nodes []
 				d.taintFilterFnc,
 			) {
 				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{ProfileName: PluginName})
+				d.handle.Evictor().Evict(ctx, pods[i], evictions.EvictOptions{StrategyName: PluginName})
 				if d.handle.Evictor().NodeLimitExceeded(node) {
 					break
 				}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (d *RemovePodsViolatingNodeTaints) Deschedule(ctx context.Context, nodes []`
`112`	`112`	`d.taintFilterFnc,`
`113`	`113`	`) {`
`114`	`114`	`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))`
`115`		`- d.handle.Evictor().Evict(ctx, pods[i], evictions.EvictOptions{ProfileName: PluginName})`
	`115`	`+ d.handle.Evictor().Evict(ctx, pods[i], evictions.EvictOptions{StrategyName: PluginName})`
`116`	`116`	`if d.handle.Evictor().NodeLimitExceeded(node) {`
`117`	`117`	`break`
`118`	`118`	`}`