github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117024 from sanposhiho/nodeaffinity-pre-score-skip

Browse Source 
feature(NodeAffinity): return Skip in PreScore when nothing to do in Score
This commit is contained in:
Kubernetes Prow Robot 2023-12-27 16:53:51 +01:00 committed by GitHub
commit afa3f114d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
View File

@ -222,6 +222,10 @@ func (pl *NodeAffinity) PreScore(ctx context.Context, cycleState *framework.Cycl
if err != nil { if err != nil {
return framework.AsStatus(err) return framework.AsStatus(err)
} }
if preferredNodeAffinity == nil && pl.addedPrefSchedTerms == nil {
// NodeAffinity Score has nothing to do with the Pod.
return framework.NewStatus(framework.Skip)
}
state := &preScoreState{ state := &preScoreState{
preferredNodeAffinity: preferredNodeAffinity, preferredNodeAffinity: preferredNodeAffinity,
} }

71
pkg/scheduler/framework/plugins/nodeaffinity/node_affinity_test.go
View File

@ -18,6 +18,7 @@ package nodeaffinity
import ( import (
"context" "context"
"fmt"
"testing" "testing"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
@ -1006,12 +1007,13 @@ func TestNodeAffinityPriority(t *testing.T) {
} }
tests := []struct { tests := []struct {
name string name string
pod *v1.Pod pod *v1.Pod
nodes []*v1.Node nodes []*v1.Node
expectedList framework.NodeScoreList expectedList framework.NodeScoreList
args config.NodeAffinityArgs args config.NodeAffinityArgs
runPreScore bool runPreScore bool
wantPreScoreStatus *framework.Status
}{ }{
{ {
name: "all nodes are same priority as NodeAffinity is nil", name: "all nodes are same priority as NodeAffinity is nil",
@ -1026,7 +1028,53 @@ func TestNodeAffinityPriority(t *testing.T) {
{ObjectMeta: metav1.ObjectMeta{Name: "node3", Labels: label3}}, {ObjectMeta: metav1.ObjectMeta{Name: "node3", Labels: label3}},
}, },
expectedList: []framework.NodeScore{{Name: "node1", Score: 0}, {Name: "node2", Score: 0}, {Name: "node3", Score: 0}}, expectedList: []framework.NodeScore{{Name: "node1", Score: 0}, {Name: "node2", Score: 0}, {Name: "node3", Score: 0}},
runPreScore: true, },
{
// PreScore returns Skip.
name: "Skip is returned in PreScore when NodeAffinity is nil",
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{},
},
},
nodes: []*v1.Node{
{ObjectMeta: metav1.ObjectMeta{Name: "node1", Labels: label1}},
},
runPreScore: true,
wantPreScoreStatus: framework.NewStatus(framework.Skip),
},
{
name: "PreScore returns error when an incoming Pod has a broken affinity",
pod: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{},
},
Spec: v1.PodSpec{
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
{
Weight: 2,
Preference: v1.NodeSelectorTerm{
MatchExpressions: []v1.NodeSelectorRequirement{
{
Key: "invalid key",
Operator: v1.NodeSelectorOpIn,
Values: []string{"bar"},
},
},
},
},
},
},
},
},
},
nodes: []*v1.Node{
{ObjectMeta: metav1.ObjectMeta{Name: "node1", Labels: label1}},
},
runPreScore: true,
wantPreScoreStatus: framework.AsStatus(fmt.Errorf(`[0].matchExpressions[0].key: Invalid value: "invalid key": name part must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyName', or 'my.name', or '123-abc', regex used for validation is '([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]')`)),
}, },
{ {
name: "no node matches preferred scheduling requirements in NodeAffinity of pod so all nodes' priority is zero", name: "no node matches preferred scheduling requirements in NodeAffinity of pod so all nodes' priority is zero",
@ -1151,8 +1199,15 @@ func TestNodeAffinityPriority(t *testing.T) {
var status *framework.Status var status *framework.Status
if test.runPreScore { if test.runPreScore {
status = p.(framework.PreScorePlugin).PreScore(ctx, state, test.pod, tf.BuildNodeInfos(test.nodes)) status = p.(framework.PreScorePlugin).PreScore(ctx, state, test.pod, tf.BuildNodeInfos(test.nodes))
if status.Code() != test.wantPreScoreStatus.Code() {
t.Errorf("unexpected status code from PreScore: want: %v got: %v", test.wantPreScoreStatus.Code().String(), status.Code().String())
}
if status.Message() != test.wantPreScoreStatus.Message() {
t.Errorf("unexpected status message from PreScore: want: %v got: %v", test.wantPreScoreStatus.Message(), status.Message())
}
if !status.IsSuccess() { if !status.IsSuccess() {
t.Errorf("unexpected error: %v", status) // no need to proceed.
return
} }
} }
var gotList framework.NodeScoreList var gotList framework.NodeScoreList