upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 00:34:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check NominatedNodeName to decide if a pod is scheduled

Browse source
This commit is contained in:
Bartosz 2025-11-20 09:26:14 +00:00
parent 5262149cd6
commit 3b4f0be6e3
No known key found for this signature in database
5 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/scheduler/framework/plugins/interpodaffinity/plugin.go
View file

@ -181,7 +181,9 @@ func (pl *InterPodAffinity) isSchedulableAfterPodChange(logger klog.Logger, pod
"pod", klog.KObj(pod))
return fwk.Queue, nil
}
if (modifiedPod != nil && modifiedPod.Spec.NodeName == "") || (originalPod != nil && originalPod.Spec.NodeName == "") {
// We don't need to check cases where NodeName or NominatedNodeName changes on a pod because in those cases Add/Delete event is fired
if (modifiedPod != nil && modifiedPod.Spec.NodeName == "" && modifiedPod.Status.NominatedNodeName == "") ||
(originalPod != nil && originalPod.Spec.NodeName == "" && originalPod.Status.NominatedNodeName == "") {
logger.V(5).Info("the added/updated/deleted pod is unscheduled, so it doesn't make the target pod schedulable",
"pod", klog.KObj(pod), "originalPod", klog.KObj(originalPod), "modifiedPod", klog.KObj(modifiedPod))
return fwk.QueueSkip, nil

12
pkg/scheduler/framework/plugins/interpodaffinity/plugin_test.go
View file

@ -154,6 +154,18 @@ func Test_isSchedulableAfterPodChange(t *testing.T) {
oldPod: st.MakePod().Node("fake-node").PodAntiAffinityIn("service", "region", []string{"securityscan", "value2"}, st.PodAntiAffinityWithRequiredReq).Label("service", "foo").Obj(),
expectedHint: fwk.QueueSkip,
},
{
name: "delete a nominated pod which doesn't match pod's anti-affinity",
pod: st.MakePod().Name("p").PodAntiAffinityIn("service", "region", []string{"securityscan", "value2"}, st.PodAntiAffinityWithRequiredReq).Obj(),
oldPod: st.MakePod().NominatedNodeName("fake-node").Label("aaa", "a").Obj(),
expectedHint: fwk.QueueSkip,
},
{
name: "delete a nominated pod which matches pod's anti-affinity",
pod: st.MakePod().Name("p").PodAntiAffinityIn("service", "region", []string{"securityscan", "value2"}, st.PodAntiAffinityWithRequiredReq).Obj(),
oldPod: st.MakePod().NominatedNodeName("fake-node").Label("service", "securityscan").Obj(),
expectedHint: fwk.Queue,
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {

6
pkg/scheduler/framework/plugins/noderesources/fit_test.go
View file

@ -1573,6 +1573,12 @@ func Test_isSchedulableAfterPodChange(t *testing.T) {
enableInPlacePodVerticalScaling: true,
expectedHint: fwk.QueueSkip,
},
"queue-on-nominated-pod-deleted": {
pod: st.MakePod().Name("pod1").UID("pod1").Req(map[v1.ResourceName]string{v1.ResourceCPU: "1"}).UID("uid0").Obj(),
oldObj: st.MakePod().Name("pod2").UID("pod2").Req(map[v1.ResourceName]string{v1.ResourceCPU: "2"}).NominatedNodeName("fake").UID("uid1").Obj(),
enableInPlacePodVerticalScaling: true,
expectedHint: fwk.Queue,
},
"skip-queue-on-disable-inplace-pod-vertical-scaling": {
pod: st.MakePod().Name("pod1").Req(map[v1.ResourceName]string{v1.ResourceCPU: "1"}).Obj(),
oldObj: st.MakePod().Name("pod2").Req(map[v1.ResourceName]string{v1.ResourceCPU: "2"}).Node("fake").Obj(),

9
pkg/scheduler/framework/plugins/podtopologyspread/plugin.go
View file

@ -184,8 +184,13 @@ func (pl *PodTopologySpread) EventsToRegister(_ context.Context) ([]fwk.ClusterE
// involvedInTopologySpreading returns true if the incomingPod is involved in the topology spreading of podWithSpreading.
func involvedInTopologySpreading(incomingPod, podWithSpreading *v1.Pod) bool {
return incomingPod.UID == podWithSpreading.UID ||
(incomingPod.Spec.NodeName != "" && incomingPod.Namespace == podWithSpreading.Namespace)
if incomingPod.UID == podWithSpreading.UID {
return true
}
if incomingPod.Spec.NodeName == "" && incomingPod.Status.NominatedNodeName == "" {
return false
}
return incomingPod.Namespace == podWithSpreading.Namespace
}
// hasConstraintWithNodeTaintsPolicyHonor returns true if any constraint has `NodeTaintsPolicy: Honor`.

16
pkg/scheduler/framework/plugins/podtopologyspread/plugin_test.go
View file

@ -236,6 +236,22 @@ func Test_isSchedulableAfterPodChange(t *testing.T) {
oldPod: st.MakePod().UID("p2").Node("fake-node").Label("foo", "").Obj(),
expectedHint: fwk.Queue,
},
{
name: "delete nominated pod with labels that don't match topologySpreadConstraints selector",
pod: st.MakePod().UID("p").Name("p").Label("foo", "").
SpreadConstraint(1, "zone", v1.DoNotSchedule, fooSelector, nil, nil, nil, nil).
Obj(),
oldPod: st.MakePod().UID("p2").NominatedNodeName("fake-node").Label("bar", "").Obj(),
expectedHint: fwk.QueueSkip,
},
{
name: "delete nominated pod with labels that match topologySpreadConstraints selector",
pod: st.MakePod().UID("p").Name("p").Label("foo", "").
SpreadConstraint(1, "zone", v1.DoNotSchedule, fooSelector, nil, nil, nil, nil).
Obj(),
oldPod: st.MakePod().UID("p2").NominatedNodeName("fake-node").Label("foo", "").Obj(),
expectedHint: fwk.Queue,
},
{
name: "delete pod with labels that don't match topologySpreadConstraints selector",
pod: st.MakePod().UID("p").Name("p").Label("foo", "").