diff --git a/pkg/scheduler/eventhandlers.go b/pkg/scheduler/eventhandlers.go index 5c88fbc7b4e..195d99af46d 100644 --- a/pkg/scheduler/eventhandlers.go +++ b/pkg/scheduler/eventhandlers.go @@ -306,7 +306,7 @@ func responsibleForPod(pod *v1.Pod, profiles profile.Map) bool { // skipPodUpdate checks whether the specified pod update should be ignored. // This function will return true if // - The pod has already been assumed, AND -// - The pod has only its ResourceVersion, Spec.NodeName and/or Annotations +// - The pod has only its ResourceVersion, Spec.NodeName, Annotations, ManagedFields and/or Finalizers // updated. func (sched *Scheduler) skipPodUpdate(pod *v1.Pod) bool { // Non-assumed pods should never be skipped. @@ -343,6 +343,8 @@ func (sched *Scheduler) skipPodUpdate(pod *v1.Pod) bool { // Same as above, when annotations are modified with ServerSideApply, // ManagedFields may also change and must be excluded p.ManagedFields = nil + // Finalizers must be excluded because scheduled result can not be affected + p.Finalizers = nil return p } assumedPodCopy, podCopy := f(assumedPod), f(pod) diff --git a/pkg/scheduler/eventhandlers_test.go b/pkg/scheduler/eventhandlers_test.go index 0efbf98df2a..c574e234da8 100644 --- a/pkg/scheduler/eventhandlers_test.go +++ b/pkg/scheduler/eventhandlers_test.go @@ -183,6 +183,27 @@ func TestSkipPodUpdate(t *testing.T) { }, expected: false, }, + { + name: "with changes on Finalizers", + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "pod-0", + Finalizers: []string{"a", "b"}, + }, + }, + isAssumedPodFunc: func(*v1.Pod) bool { + return true + }, + getPodFunc: func(*v1.Pod) *v1.Pod { + return &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "pod-0", + Finalizers: []string{"c", "d"}, + }, + } + }, + expected: true, + }, } { t.Run(test.name, func(t *testing.T) { c := &Scheduler{