Merge pull request #114946 from mimowo/automated-cherry-pick-of-#114923-upstream-release-1.26

k8s-ci-robot · web-flow · commit 47f0a82245a8 · 2023-01-12T21:51:11.000-08:00
Automated cherry pick of #114923: Do not leak cross namespace pod metadata in preemption events
diff --git a/pkg/scheduler/framework/preemption/preemption.go b/pkg/scheduler/framework/preemption/preemption.go
@@ -378,8 +378,7 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1.
 				return
 			}
 		}
-		fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by %v/%v on node %v",
-			pod.Namespace, pod.Name, c.Name())
+		fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by a pod on node %v", c.Name())
 	}
 
 	fh.Parallelizer().Until(ctx, len(c.Victims().Pods), preemptPod, ev.PluginName)

Original file line number	Diff line number	Diff line change
`@@ -378,8 +378,7 @@ func (ev Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod v1.`
`378`	`378`	`return`
`379`	`379`	`}`
`380`	`380`	`}`
`381`		`- fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by %v/%v on node %v",`
`382`		`- pod.Namespace, pod.Name, c.Name())`
	`381`	`+ fh.EventRecorder().Eventf(victim, pod, v1.EventTypeNormal, "Preempted", "Preempting", "Preempted by a pod on node %v", c.Name())`
`383`	`382`	`}`
`384`	`383`
`385`	`384`	`fh.Parallelizer().Until(ctx, len(c.Victims().Pods), preemptPod, ev.PluginName)`