Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable lease reconciler, fix shutdown race #63383

Merged
merged 3 commits into from
May 4, 2018
Merged

Re-enable lease reconciler, fix shutdown race #63383

merged 3 commits into from
May 4, 2018

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented May 3, 2018 •
edited
Loading

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 apiserver: change default reconciler to LeaseEndpoint #58474 to make the default the lease reconciler
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.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 3, 2018
@liggitt liggitt mentioned this pull request May 3, 2018
Closed
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 3, 2018
@liggitt liggitt mentioned this pull request May 3, 2018
Merged
1 task
@liggitt
Copy link
Member Author

liggitt commented May 3, 2018

cc @ixdy @rphillips

@ixdy
Copy link
Member

ixdy commented May 3, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 3, 2018
@rphillips
Copy link
Member

lgtm!

@dims
Copy link
Member

dims commented May 3, 2018

/lgtm

@cblecker
Copy link
Member

cblecker commented May 3, 2018

/lgtm
/assign @sttts
for approval

@deads2k
Copy link
Contributor

deads2k commented May 4, 2018

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, deads2k, dims, ixdy, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 4, 2018
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

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 here.

@k8s-github-robot k8s-github-robot merged commit 31511f9 into kubernetes:master May 4, 2018
@liggitt liggitt deleted the lease-reconciler branch May 4, 2018 20:04
@redbaron redbaron mentioned this pull request May 12, 2018
Merged
@liggitt liggitt mentioned this pull request Jun 11, 2018
Merged
k8s-github-robot pushed a commit that referenced this pull request Jun 20, 2018
Merge pull request #63746 from redbaron/endpoint-reconciler-shutdown
caf6b90 
Automatic merge from submit-queue.

Let the kubernetes service reconciler timeout on shutdown

Cherry-pick of shutdown fix from #63383 to 1.9 branch

Fixes the apiserver shutdown to not hang forever if the kubernetes service reconciler cannot persist to etcd

```release-note
NONE
```

/sig api-machinery

cc: @liggitt
rfranzke added a commit to gardener/gardener that referenced this pull request Jun 25, 2018
@rfranzke
Do not use --apiserver-count flag for Shoots with Kubernetes >= 1.11
ee3096e 
See kubernetes/kubernetes#63383, the default endpoint reconciler type is 'lease'. Only the deprecated 'master-count' reconciler type requires this flag.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@davidopp davidopp Awaiting requested review from davidopp

@ixdy ixdy Awaiting requested review from ixdy

Assignees

@dims dims

@sttts sttts

@cblecker cblecker

@ixdy ixdy

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@liggitt @ixdy @rphillips @dims @cblecker @deads2k @k8s-ci-robot @k8s-github-robot @sttts