Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a450116c
Commit
a450116c
authored
Feb 06, 2018
by
Avesh Agarwal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to register priority function ResourceLimitsPriority correctly.
parent
989e4f86
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
defaults.go
pkg/scheduler/algorithmprovider/defaults/defaults.go
+6
-5
No files found.
pkg/scheduler/algorithmprovider/defaults/defaults.go
View file @
a450116c
...
@@ -107,10 +107,6 @@ func init() {
...
@@ -107,10 +107,6 @@ func init() {
factory
.
RegisterPriorityFunction2
(
"ImageLocalityPriority"
,
priorities
.
ImageLocalityPriorityMap
,
nil
,
1
)
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
)
// Prioritizes nodes that satisfy pod's resource limits
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ResourceLimitsPriorityFunction
)
{
factory
.
RegisterPriorityFunction2
(
"ResourceLimitsPriority"
,
priorities
.
ResourceLimitsPriorityMap
,
nil
,
1
)
}
}
}
func
defaultPredicates
()
sets
.
String
{
func
defaultPredicates
()
sets
.
String
{
...
@@ -182,7 +178,6 @@ func defaultPredicates() sets.String {
...
@@ -182,7 +178,6 @@ func defaultPredicates() sets.String {
// ApplyFeatureGates applies algorithm by feature gates.
// ApplyFeatureGates applies algorithm by feature gates.
func
ApplyFeatureGates
()
{
func
ApplyFeatureGates
()
{
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
TaintNodesByCondition
)
{
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
TaintNodesByCondition
)
{
// Remove "CheckNodeCondition" predicate
// Remove "CheckNodeCondition" predicate
factory
.
RemoveFitPredicate
(
predicates
.
CheckNodeConditionPred
)
factory
.
RemoveFitPredicate
(
predicates
.
CheckNodeConditionPred
)
...
@@ -200,6 +195,12 @@ func ApplyFeatureGates() {
...
@@ -200,6 +195,12 @@ func ApplyFeatureGates() {
glog
.
Warningf
(
"TaintNodesByCondition is enabled, PodToleratesNodeTaints predicate is mandatory"
)
glog
.
Warningf
(
"TaintNodesByCondition is enabled, PodToleratesNodeTaints predicate is mandatory"
)
}
}
// Prioritizes nodes that satisfy pod's resource limits
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ResourceLimitsPriorityFunction
)
{
factory
.
RegisterPriorityFunction2
(
"ResourceLimitsPriority"
,
priorities
.
ResourceLimitsPriorityMap
,
nil
,
1
)
}
}
}
func
registerAlgorithmProvider
(
predSet
,
priSet
sets
.
String
)
{
func
registerAlgorithmProvider
(
predSet
,
priSet
sets
.
String
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment