Merge pull request #16111 from joelsmith/master

Automatic merge from submit-queue (batch tested with PRs 16295, 16314, 16326, 16111) UPSTREAM: 49142: Slow-start batch pod creation of rs, rc, ds, jobs xref kubernetes/kubernetes#49142 upstream issue: kubernetes/kubernetes#49145
openshift · Sep 13, 2017 · 4f1394d · 4f1394d
2 parents b26288c + 4cb5063
commit 4f1394d
Show file tree

Hide file tree

Showing 13 changed files with 312 additions and 91 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/daemon/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/job/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go