Multi master patch #41351

Merged
merged 2 commits into from Feb 25, 2017

Conversation

Projects
None yet
7 participants
@chuckbutler
Member

chuckbutler 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-reviewable

This comment has been minimized.

Show comment
Hide comment
@k8s-reviewable

k8s-reviewable Feb 13, 2017

This change is Reviewable

This change is Reviewable

@ivan4th

This comment has been minimized.

Show comment
Hide comment
@ivan4th

ivan4th Feb 21, 2017

Member

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?

Member

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 label Feb 21, 2017

@ivan4th

This comment has been minimized.

Show comment
Hide comment
@ivan4th

ivan4th Feb 21, 2017

Member

/lgtm

Member

ivan4th commented Feb 21, 2017

/lgtm

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 21, 2017

Member

@k8s-bot gce etcd3 e2e test this

@k8s-bot non-cri e2e test this

Member

chuckbutler commented Feb 21, 2017

@k8s-bot gce etcd3 e2e test this

@k8s-bot non-cri e2e test this

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 21, 2017

Member

@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 :)

Member

chuckbutler commented Feb 21, 2017

@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 :)

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

@k8s-bot gce etcd3 e2e test this

Member

chuckbutler commented Feb 22, 2017

@k8s-bot gce etcd3 e2e test this

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

@k8s-bot bazel test this

Member

chuckbutler commented Feb 22, 2017

@k8s-bot bazel test this

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

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.

Member

chuckbutler commented Feb 22, 2017

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.

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

Limbo averted. things are progressing 🎉

Member

chuckbutler commented Feb 22, 2017

Limbo averted. things are progressing 🎉

Fixes for #41019
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.
@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

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

Member

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

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

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.

Member

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

chuckbutler added a commit to chuckbutler/kubernetes that referenced this pull request Feb 22, 2017

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

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

upstream issue seems resolved. giving this another go

@k8s-bot verify test this

Member

chuckbutler commented Feb 22, 2017

upstream issue seems resolved. giving this another go

@k8s-bot verify test this

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 22, 2017

Member

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

Member

chuckbutler commented Feb 22, 2017

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

@ivan4th

This comment has been minimized.

Show comment
Hide comment
@ivan4th

ivan4th Feb 23, 2017

Member

/lgtm

Member

ivan4th commented Feb 23, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Feb 23, 2017

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Feb 23, 2017

Collaborator

[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

Collaborator

k8s-merge-robot commented Feb 23, 2017

[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

@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 23, 2017

Member

xref for test flakes: #40295 #39975

Member

chuckbutler commented Feb 23, 2017

xref for test flakes: #40295 #39975

k8s-merge-robot added a commit that referenced this pull request Feb 24, 2017

Merge pull request #41908 from chuckbutler/remove-ivan-from-juju
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
```
@chuckbutler

This comment has been minimized.

Show comment
Hide comment
@chuckbutler

chuckbutler Feb 24, 2017

Member

@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

Member

chuckbutler commented Feb 24, 2017

@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

This comment has been minimized.

Show comment
Hide comment
@mbruzek

mbruzek Feb 24, 2017

Member

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

Member

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

This comment has been minimized.

Show comment
Hide comment
@mbruzek

mbruzek Feb 24, 2017

Member

@k8s-bot node e2e test this

Member

mbruzek commented Feb 24, 2017

@k8s-bot node e2e test this

@mbruzek

This comment has been minimized.

Show comment
Hide comment
@mbruzek

mbruzek Feb 24, 2017

Member

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

Member

mbruzek commented Feb 24, 2017

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

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Feb 25, 2017

Collaborator

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

Collaborator

k8s-merge-robot commented Feb 25, 2017

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

@k8s-merge-robot k8s-merge-robot merged commit 3701e54 into kubernetes:master Feb 25, 2017

11 of 15 checks passed

Jenkins GCI GCE e2e Jenkins overloaded. Please try again later.
Details
Jenkins GCI GKE smoke e2e Jenkins overloaded. Please try again later.
Details
Jenkins GKE smoke e2e Jenkins overloaded. Please try again later.
Details
Jenkins non-CRI GCE e2e Jenkins overloaded. Please try again later.
Details
Jenkins Bazel Build Build succeeded.
Details
Jenkins GCE Node e2e Build succeeded.
Details
Jenkins GCE e2e Build succeeded.
Details
Jenkins GCE etcd3 e2e Build succeeded.
Details
Jenkins Kubemark GCE e2e Build succeeded.
Details
Jenkins kops AWS e2e Build succeeded.
Details
Jenkins non-CRI GCE Node e2e Build succeeded.
Details
Jenkins unit/integration Build succeeded.
Details
Jenkins verification Build succeeded.
Details
Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation chuckbutler authorized
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment