mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-15 06:01:50 +00:00
Move image locality to default priority functions
This commit is contained in:
@@ -94,10 +94,6 @@ func init() {
|
|||||||
// Register the priority function so that its available
|
// Register the priority function so that its available
|
||||||
// but do not include it as part of the default priorities
|
// but do not include it as part of the default priorities
|
||||||
factory.RegisterPriorityFunction2("EqualPriority", core.EqualPriorityMap, nil, 1)
|
factory.RegisterPriorityFunction2("EqualPriority", core.EqualPriorityMap, nil, 1)
|
||||||
// ImageLocalityPriority prioritizes nodes based on locality of images requested by a pod. Nodes with larger size
|
|
||||||
// of already-installed packages required by the pod will be preferred over nodes with no already-installed
|
|
||||||
// packages required by the pod or a small total size of already-installed packages required by the pod.
|
|
||||||
factory.RegisterPriorityFunction2("ImageLocalityPriority", priorities.ImageLocalityPriorityMap, nil, 1)
|
|
||||||
// Optional, cluster-autoscaler friendly priority function - give used nodes higher priority.
|
// Optional, cluster-autoscaler friendly priority function - give used nodes higher priority.
|
||||||
factory.RegisterPriorityFunction2("MostRequestedPriority", priorities.MostRequestedPriorityMap, nil, 1)
|
factory.RegisterPriorityFunction2("MostRequestedPriority", priorities.MostRequestedPriorityMap, nil, 1)
|
||||||
factory.RegisterPriorityFunction2(
|
factory.RegisterPriorityFunction2(
|
||||||
@@ -260,6 +256,9 @@ func defaultPriorities() sets.String {
|
|||||||
|
|
||||||
// Prioritizes nodes that marked with taint which pod can tolerate.
|
// Prioritizes nodes that marked with taint which pod can tolerate.
|
||||||
factory.RegisterPriorityFunction2("TaintTolerationPriority", priorities.ComputeTaintTolerationPriorityMap, priorities.ComputeTaintTolerationPriorityReduce, 1),
|
factory.RegisterPriorityFunction2("TaintTolerationPriority", priorities.ComputeTaintTolerationPriorityMap, priorities.ComputeTaintTolerationPriorityReduce, 1),
|
||||||
|
|
||||||
|
// ImageLocalityPriority prioritizes nodes that have images requested by the pod present.
|
||||||
|
factory.RegisterPriorityFunction2("ImageLocalityPriority", priorities.ImageLocalityPriorityMap, nil, 1),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -59,7 +59,8 @@ func TestDefaultPriorities(t *testing.T) {
|
|||||||
"BalancedResourceAllocation",
|
"BalancedResourceAllocation",
|
||||||
"NodePreferAvoidPodsPriority",
|
"NodePreferAvoidPodsPriority",
|
||||||
"NodeAffinityPriority",
|
"NodeAffinityPriority",
|
||||||
"TaintTolerationPriority")
|
"TaintTolerationPriority",
|
||||||
|
"ImageLocalityPriority")
|
||||||
if expected := defaultPriorities(); !result.Equal(expected) {
|
if expected := defaultPriorities(); !result.Equal(expected) {
|
||||||
t.Errorf("expected %v got %v", expected, result)
|
t.Errorf("expected %v got %v", expected, result)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user