Replace PodFitsPorts with PodFitsHostPorts

This commit is contained in:
HaiyangDING
2015-09-29 17:44:26 +08:00
parent 9d49e143dc
commit 6e11cd6028
6 changed files with 15 additions and 7 deletions

View File

@@ -69,11 +69,16 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
// Do not change this JSON after 1.1 is tagged. A failure indicates backwards compatibility with 1.1 was broken.
"1.1": {
JSON: `{
"priorities": [
"predicates": [
{"name": "PodFitsHostPorts"}
],"priorities": [
{"name": "SelectorSpreadPriority", "weight": 2}
]
}`,
ExpectedPolicy: schedulerapi.Policy{
Predicates: []schedulerapi.PredicatePolicy{
{Name: "PodFitsHostPorts"},
},
Priorities: []schedulerapi.PriorityPolicy{
{Name: "SelectorSpreadPriority", Weight: 2},
},

View File

@@ -46,12 +46,15 @@ func init() {
Weight: 1,
},
)
// PodFitsPorts has been replaced by PodFitsHostPorts for better user understanding.
// For backwards compatibility with 1.0, PodFitsPorts is regitered as well.
factory.RegisterFitPredicate("PodFitsPorts", predicates.PodFitsHostPorts)
}
func defaultPredicates() sets.String {
return sets.NewString(
// Fit is defined based on the absence of port conflicts.
factory.RegisterFitPredicate("PodFitsPorts", predicates.PodFitsPorts),
factory.RegisterFitPredicate("PodFitsHostPorts", predicates.PodFitsHostPorts),
// Fit is determined by resource availability.
factory.RegisterFitPredicateFactory(
"PodFitsResources",