Merge pull request #16718 from jsafrane/fix-predicate-counting

Automatic merge from submit-queue. UPSTREAM: 53135: Fixed counting of unbound PVCs towards limit of attached volumes. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1499172
openshift · Oct 6, 2017 · 88b46e1 · 88b46e1
2 parents d47d1a1 + 8e62fb0
commit 88b46e1
Show file tree

Hide file tree

Showing 3 changed files with 182 additions and 28 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