Merge pull request #16575 from joelsmith/release-3.6

Automatic merge from submit-queue. Cherry-pick #15067 endpoints fixes. cc @sjenning @eparis @derekwaynecarr This is a cherry-pick of #15067 to prevent too-frequent processing of endpoint updates. https://bugzilla.redhat.com/show_bug.cgi?id=1481603 Here's the original text of #15067 as written by @aveshagarwal: > Fixes #14710 > > Note: I had to manually merge changes and due to this, the commits might not match exactly. > > It has following 2 complete upstream PRs: > kubernetes/kubernetes#47731 (with some modifications/additions). > kubernetes/kubernetes#47788 > > And one partial PR to make above PRs compile: > kubernetes/kubernetes#44408 (Edited to fix bz link -- originally sent with wrong bug)
openshift · Sep 29, 2017 · f7a367c · f7a367c
2 parents 08fb8fd + f1ccc8e
commit f7a367c
Show file tree

Hide file tree

Showing 4 changed files with 248 additions and 171 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go