scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable PodAffinity by default in scheduler

Browse Source
This commit is contained in:
Wojciech Tyczynski
2016-08-02 11:05:22 +02:00
parent ca7ad6896b
commit 022719b323
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@@ -812,7 +812,7 @@ func (c *PodAffinityChecker) InterPodAffinityMatches(pod *api.Pod, meta interfac
return false, fmt.Errorf("node not found")
}
if !c.satisfiesExistingPodsAntiAffinity(pod, meta, node) {
return false, nil
return false, ErrPodAffinityNotMatch
}
// Now check if <pod> requirements will be satisfied on this node.
@@ -824,7 +824,7 @@ func (c *PodAffinityChecker) InterPodAffinityMatches(pod *api.Pod, meta interfac
return true, nil
}
if !c.satisfiesPodsAffinityAntiAffinity(pod, node, affinity) {
return false, nil
return false, ErrPodAffinityNotMatch
}
if glog.V(10) {