Merge pull request #16864 from aveshagarwal/master-backport-53793-53884

Automatic merge from submit-queue. UPSTREAM: 53989: Remove repeated random string generations in scheduler volume predicate @sjenning @smarterclayton Though the upstream PR 53793 has been backported to kube 1.7 branch (53884). I am not sure if we have a plan for another origin rebase to latest kube 1.7, and if we would want to wait for that. So this backports following 3 PRs: kubernetes/kubernetes#53793 kubernetes/kubernetes#53720 (partial) kubernetes/kubernetes#53989
openshift · Oct 25, 2017 · 145cdaf · 145cdaf
2 parents b396ee8 + b3ed103
commit 145cdaf
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 43 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller_test.go
diff --git a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/configurator.go b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/configurator.go
diff --git a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go
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/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go