Merge pull request #17442 from jsafrane/fix-predicate-counting-3.8

Automatic merge from submit-queue (batch tested with PRs 16538, 17430, 17432, 17433, 17442). Fix predicate counting Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1496256 There are two upstream commits here, 53135 was already merged to 3.3 - 3.7, 53989 fixes performance regression that was discovered after merge to 3.7 and earlier. /assign @mfojtik
openshift · Nov 23, 2017 · 88a6a98 · 88a6a98
2 parents 783c0ad + 41001e5
commit 88a6a98
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 29 deletions.
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/BUILD b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/BUILD
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go