Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(scheduler): implement node affinity as score plugin #83998

Merged
merged 1 commit into from
Oct 17, 2019
Merged

feat(scheduler): implement node affinity as score plugin #83998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 12 additions & 11 deletions pkg/scheduler/api/compatibility/compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
),
wantPrioritizers: sets.NewString(
"EqualPriority",
"NodeAffinityPriority",
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
Expand All @@ -186,6 +185,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
},
},
},
Expand Down Expand Up @@ -238,7 +238,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
),
wantPlugins: map[string][]kubeschedulerconfig.Plugin{
Expand All @@ -253,6 +252,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
},
Expand Down Expand Up @@ -310,7 +310,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
),
Expand All @@ -326,6 +325,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -393,7 +393,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
),
Expand All @@ -409,6 +408,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -489,7 +489,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
),
Expand All @@ -505,6 +504,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -586,7 +586,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
),
Expand All @@ -603,6 +602,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -689,7 +689,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
),
Expand All @@ -706,6 +705,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -804,7 +804,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
"RequestedToCapacityRatioPriority",
Expand All @@ -822,6 +821,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -922,7 +922,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
"RequestedToCapacityRatioPriority",
Expand All @@ -940,6 +939,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -1040,7 +1040,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
"RequestedToCapacityRatioPriority",
Expand All @@ -1058,6 +1057,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -1162,7 +1162,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
"LeastRequestedPriority",
"BalancedResourceAllocation",
"SelectorSpreadPriority",
"NodeAffinityPriority",
"InterPodAffinityPriority",
"MostRequestedPriority",
"RequestedToCapacityRatioPriority",
Expand All @@ -1180,6 +1179,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 2},
{Name: "NodeAffinity", Weight: 2},
{Name: "NodePreferAvoidPods", Weight: 2},
{Name: "TaintToleration", Weight: 2},
},
Expand Down Expand Up @@ -1216,6 +1216,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
}
scoreToPriorityMap := map[string]string{
"ImageLocality": "ImageLocalityPriority",
"NodeAffinity": "NodeAffinityPriority",
"NodePreferAvoidPods": "NodePreferAvoidPodsPriority",
"TaintToleration": "TaintTolerationPriority",
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/scheduler/framework/plugins/default_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ func NewDefaultConfigProducerRegistry() *ConfigProducerRegistry {
return
})

registry.RegisterPriority(priorities.NodeAffinityPriority,
func(args ConfigProducerArgs) (plugins config.Plugins, pluginConfig []config.PluginConfig) {
plugins.Score = appendToPluginSet(plugins.Score, nodeaffinity.Name, &args.Weight)
return
})

registry.RegisterPriority(priorities.ImageLocalityPriority,
func(args ConfigProducerArgs) (plugins config.Plugins, pluginConfig []config.PluginConfig) {
plugins.Score = appendToPluginSet(plugins.Score, imagelocality.Name, &args.Weight)
Expand Down
1 change: 1 addition & 0 deletions pkg/scheduler/framework/plugins/nodeaffinity/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/scheduler/algorithm/predicates:go_default_library",
"//pkg/scheduler/algorithm/priorities:go_default_library",
"//pkg/scheduler/framework/plugins/migration:go_default_library",
"//pkg/scheduler/framework/v1alpha1:go_default_library",
"//pkg/scheduler/nodeinfo:go_default_library",
Expand Down
39 changes: 34 additions & 5 deletions pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,24 @@ package nodeaffinity

import (
"context"
"fmt"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/migration"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
"k8s.io/kubernetes/pkg/scheduler/nodeinfo"
)

// NodeAffinity is a plugin that checks if a pod node selector matches the node label.
type NodeAffinity struct{}
type NodeAffinity struct {
handle framework.FrameworkHandle
}

var _ = framework.FilterPlugin(&NodeAffinity{})
var _ framework.FilterPlugin = &NodeAffinity{}
var _ framework.ScorePlugin = &NodeAffinity{}

// Name is the name of the plugin used in the plugin registry and configurations.
const Name = "NodeAffinity"
Expand All @@ -41,12 +46,36 @@ func (pl *NodeAffinity) Name() string {
}

// Filter invoked at the filter extension point.
func (pl *NodeAffinity) Filter(ctx context.Context, _ *framework.CycleState, pod *v1.Pod, nodeInfo *nodeinfo.NodeInfo) *framework.Status {
func (pl *NodeAffinity) Filter(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeInfo *nodeinfo.NodeInfo) *framework.Status {
_, reasons, err := predicates.PodMatchNodeSelector(pod, nil, nodeInfo)
return migration.PredicateResultToFrameworkStatus(reasons, err)
}

// Score invoked at the Score extension point.
func (pl *NodeAffinity) Score(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, exist := pl.handle.NodeInfoSnapshot().NodeInfoMap[nodeName]
if !exist {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("node %q does not exist in NodeInfoSnapshot", nodeName))
}

meta := migration.PriorityMetadata(state)
s, err := priorities.CalculateNodeAffinityPriorityMap(pod, meta, nodeInfo)
return s.Score, migration.ErrorToFrameworkStatus(err)
}

// NormalizeScore invoked after scoring all nodes.
func (pl *NodeAffinity) NormalizeScore(ctx context.Context, state *framework.CycleState, pod *v1.Pod, scores framework.NodeScoreList) *framework.Status {
// Note that CalculateNodeAffinityPriorityReduce doesn't use priority metadata, hence passing nil here.
err := priorities.CalculateNodeAffinityPriorityReduce(pod, nil, pl.handle.NodeInfoSnapshot().NodeInfoMap, scores)
return migration.ErrorToFrameworkStatus(err)
}

// ScoreExtensions of the Score plugin.
func (pl *NodeAffinity) ScoreExtensions() framework.ScoreExtensions {
return pl
}

// New initializes a new plugin and returns it.
func New(_ *runtime.Unknown, _ framework.FrameworkHandle) (framework.Plugin, error) {
return &NodeAffinity{}, nil
func New(_ *runtime.Unknown, h framework.FrameworkHandle) (framework.Plugin, error) {
return &NodeAffinity{handle: h}, nil
}