Merge pull request #25536 from tnozicka/backport-kcm-ks-graceful-4.5

[release-4.5] Bug 1881351: KCM and KS graceful termination
openshift · Oct 29, 2020 · 3f0e056 · 3f0e056
2 parents 45b9524 + 6aaf051
commit 3f0e056
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-scheduler/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-scheduler/app/server.go