diff --git a/roles/kubernetes/master/templates/kube-scheduler-policy.yaml.j2 b/roles/kubernetes/master/templates/kube-scheduler-policy.yaml.j2 index 6616adc6f..b87ec971b 100644 --- a/roles/kubernetes/master/templates/kube-scheduler-policy.yaml.j2 +++ b/roles/kubernetes/master/templates/kube-scheduler-policy.yaml.j2 @@ -2,17 +2,27 @@ "kind" : "Policy", "apiVersion" : "v1", "predicates" : [ - {"name" : "PodFitsHostPorts"}, - {"name" : "PodFitsResources"}, + {"name" : "MaxEBSVolumeCount"}, + {"name" : "MaxGCEPDVolumeCount"}, + {"name" : "MaxAzureDiskVolumeCount"}, + {"name" : "MatchInterPodAffinity"}, {"name" : "NoDiskConflict"}, - {"name" : "MatchNodeSelector"}, - {"name" : "HostName"} + {"name" : "GeneralPredicates"}, + {"name" : "CheckNodeMemoryPressure"}, + {"name" : "CheckNodeDiskPressure"}, + {"name" : "CheckNodePIDPressure"}, + {"name" : "CheckNodeCondition"}, + {"name" : "PodToleratesNodeTaints"}, + {"name" : "CheckVolumeBinding"} ], "priorities" : [ + {"name" : "SelectorSpreadPriority", "weight" : 1}, + {"name" : "InterPodAffinityPriority", "weight" : 1}, {"name" : "LeastRequestedPriority", "weight" : 1}, {"name" : "BalancedResourceAllocation", "weight" : 1}, - {"name" : "ServiceSpreadingPriority", "weight" : 1}, - {"name" : "EqualPriority", "weight" : 1} + {"name" : "NodePreferAvoidPodsPriority", "weight" : 1}, + {"name" : "NodeAffinityPriority", "weight" : 1}, + {"name" : "TaintTolerationPriority", "weight" : 1} ], "hardPodAffinitySymmetricWeight" : 10 }