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.

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

Multi master patch #41351

Merged
merged 2 commits into from
Feb 25, 2017
Merged

Conversation

lazypower
Copy link
Contributor

@lazypower lazypower commented Feb 13, 2017

What this PR does / why we need it: Corrects a sync files issue present when running in a HA Master configuration. This PR adds logic to syncronize on first deployment for /etc/kubernetes/serviceaccount.key which will cause cypto verification failure if not 1:1 on each master unit. Additionally syncs basic_auth and additional files in /srv/kubernetes.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #41019

Special notes for your reviewer: This requires PR #41251 as a dependency before merging.

Release note:

Juju - K8s master charm now properly keeps distributed master files in sync for an HA control plane.

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 13, 2017
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 13, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@ivan4th
Copy link
Contributor

ivan4th commented Feb 21, 2017

I don't see any problems with this patch, but I can't test juju-based clusters at the moment. I already mentioned this in another PR, but maybe I'm should be removed from the reviewer list of this directory?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 21, 2017
@ivan4th
Copy link
Contributor

ivan4th commented Feb 21, 2017

/lgtm

@lazypower
Copy link
Contributor Author

@k8s-bot gce etcd3 e2e test this

@k8s-bot non-cri e2e test this

@lazypower
Copy link
Contributor Author

@ivan4th - I'll make sure to follow up and issue a PR removing you from the reviewers list. Thanks for letting us know you're not comfortable reviewing these submissions. I'm happy to remove you and should you ever feel comfortable moving forward just issue an incoming PR and let me know so I can +1 :)

@lazypower
Copy link
Contributor Author

@k8s-bot gce etcd3 e2e test this

@lazypower
Copy link
Contributor Author

@k8s-bot bazel test this

@lazypower
Copy link
Contributor Author

Fantastic this looks good now. I don't see a follow up that it's on it's way to the submit queue however, and based on PR #41256 it seems like our contributions are stuck in a limbo.

@lazypower
Copy link
Contributor Author

Limbo averted. things are progressing 🎉

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 22, 2017
This branch sync's the crypto keys, and flat-files used for auth with
all the masters when scaling the kubernetes-master units. This should
fix the mis-matched crypto keys seen when rebooting units after first
deploy.
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 22, 2017
@lazypower
Copy link
Contributor Author

lazypower commented Feb 22, 2017

@ivan4th - I got ninja'd by another branches lint fixes (hence the rebase). Once I've got the tests settled I'll re-ping for re LGTM label. Thanks for supporting this branch until landing.

@lazypower
Copy link
Contributor Author

lazypower commented Feb 22, 2017

Minor flake here -

 I0222 09:47:26.605] FAILED   hack/make-rules/../../hack/verify-staging-godeps.sh	211s

@k8s-bot verify test this

-- edit --

this doesn't appear to have an open flake against it, but is also the first time I've seen this particular test failure. Will open a bug if it continues to be a problem.

lazypower pushed a commit to lazypower/kubernetes that referenced this pull request Feb 22, 2017
Per ivans request in kubernetes#41351 he would like to be removed from the
reviewers list in this directory tree. This commit addresses that
request.
@lazypower
Copy link
Contributor Author

upstream issue seems resolved. giving this another go

@k8s-bot verify test this

@lazypower
Copy link
Contributor Author

@ivan4th - ok this looks ready to re-review/LGTM again. all the tests have passed and the merge conflict is resolved. Thanks!

@ivan4th
Copy link
Contributor

ivan4th commented Feb 23, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 23, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: chuckbutler, ivan4th

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@lazypower
Copy link
Contributor Author

xref for test flakes: #40295 #39975

k8s-github-robot pushed a commit that referenced this pull request Feb 24, 2017
Automatic merge from submit-queue

Remove ivan4th from reviewers

**What this PR does / why we need it**:

Per @ivan4th request in #41351 he would like to be removed from the
reviewers list in this directory tree. This commit addresses that
request.

**Special notes for your reviewer**:

As Ivan has already investigated the PR in question under 41351 I would like to see that driven to landing before landing this OWNERS file change, unless another reviewer would like to step in and help land that open PR.

**Release note**:

```release-note
NONE
```
@lazypower
Copy link
Contributor Author

@k8s-bot non-cri node e2e test this
@k8s-bot non-cri e2e test this
@k8s-bot kops aws e2e test this
@k8s-bot kubemark e2e test this

@mbruzek
Copy link
Contributor

mbruzek commented Feb 24, 2017

This change has been reviewed and approved days ago. Now this is getting"Jenkins overloaded" messages. We do want to get this change in before code freeze as it is an important fix for our cluster.

@k8s-bot gce etcd3 e2e test this

@mbruzek
Copy link
Contributor

mbruzek commented Feb 24, 2017

@k8s-bot node e2e test this

@mbruzek
Copy link
Contributor

mbruzek commented Feb 24, 2017

All the required tests have passed. I see this PR in the submit queue! Yeah!

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40665, 41094, 41351, 41721, 41843)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CDK - known_tokens are wrong when rebooting one of the master randomly
6 participants