Merge pull request #63383 from liggitt/lease-reconciler
Automatic merge from submit-queue (batch tested with PRs 63315, 63383, 63318, 63439). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Re-enable lease reconciler, fix shutdown race Fixes #63378 Fixes #57617 * Fixes the openapi script to wait for the apiserver on shutdown (like all the other scripts do) * Fixes the apiserver shutdown to not hang forever if the kubernetes service reconciler cannot persist to etcd * Readds https://github.com/kubernetes/kubernetes/pull/58474 to make the default the lease reconciler ```release-note kube-apiserver: the default `--endpoint-reconciler-type` is now `lease`. The `master-count` endpoint reconciler type is deprecated and will be removed in 1.13. ```
This commit is contained in:
@@ -31,7 +31,11 @@ make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
|
||||
|
||||
function cleanup()
|
||||
{
|
||||
[[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
|
||||
if [[ -n ${APISERVER_PID-} ]]; then
|
||||
kill ${APISERVER_PID} 1>&2 2>/dev/null
|
||||
wait ${APISERVER_PID} || true
|
||||
fi
|
||||
unset APISERVER_PID
|
||||
|
||||
kube::etcd::cleanup
|
||||
|
||||
|
Reference in New Issue
Block a user