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

Updated port for HA master etcd. #32204

Merged
merged 1 commit into from
Sep 11, 2016
Merged

Updated port for HA master etcd. #32204

merged 1 commit into from
Sep 11, 2016

Conversation

jszczepkowski
Copy link
Contributor

@jszczepkowski jszczepkowski commented Sep 7, 2016 •
edited by k8s-oncall
Loading

Updated port for HA master etcd to 2379 (needed after #30514).

This change is Reviewable

@jszczepkowski
Updated port for HA master etcd.
8541ea6 
Updated port for HA master etcd to 2379 (needed after kubernetes#30514).
@jszczepkowski jszczepkowski added the release-note-none Denotes a PR that doesn't merit a release note. label Sep 7, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 7, 2016
@gmarek gmarek modified the milestones: v1.5, v1.4-nonblocking Sep 8, 2016
@gmarek gmarek added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 8, 2016
@gmarek
Copy link
Contributor

gmarek commented Sep 8, 2016 •
edited
Loading

This fixes experimental HA functionality in 1.4 release. I believe it should go in v1.4 - @pwittrock if you agree please apply cherrypick label.

@fgrzadkowski
Copy link
Contributor

LGTM

@k8s-bot
Copy link

k8s-bot commented Sep 11, 2016

GCE e2e build/test passed for commit 8541ea6.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Sep 11, 2016

GCE e2e build/test passed for commit 8541ea6.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 8f35019 into kubernetes:master Sep 11, 2016
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@gmarek gmarek modified the milestones: v1.4, v1.4-nonblocking Sep 12, 2016
@pwittrock pwittrock added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 12, 2016
@pwittrock
Copy link
Member

Cherrypick Terms of Service

  1. You are responsible for manually QAing this change in the next beta / release candidate to contain it
  2. You must provide a risk assessment in the PR description including the following
  • Risk surface of accepting this cherrypick: what could go wrong
  • How easy it is to revert if needed
  • Why it is worth the risk, burden to cherrypick and verify the tests stay green, and noise it creates
  1. If this is a launching blocking fix you must provide a justification. Otherwise define its urgency as one of:
    • launching blocking
    • important
    • best effort

@gmarek
Copy link
Contributor

gmarek commented Sep 12, 2016

cc @jszczepkowski

@jszczepkowski
Copy link
Contributor Author

  • low risk: we are only changing kube-up script for HA master (currenlty not tested and not used)
  • easy to revert if needed: fix contains only 3 trivial lines of shell script
  • if the patch is cherry picked: we will be able to test experimental HA master on branch 1.4
  • best effort: not launch blocking, experimental functionality

@eparis eparis mentioned this pull request Sep 13, 2016
Merged
pwittrock pushed a commit that referenced this pull request Sep 13, 2016
@eparis
Merge pull request #32204 from jszczepkowski/ha-port-fix
0ebe247 
Automatic merge from submit-queue

Updated port for HA master etcd.
(cherry picked from commit 8f35019)
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@maisem maisem mentioned this pull request Sep 22, 2016
Closed
@jszczepkowski
Copy link
Contributor Author

Part of kubernetes/enhancements#48

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@eparis
Merge pull request kubernetes#32204 from jszczepkowski/ha-port-fix
82c4f48 
Automatic merge from submit-queue

Updated port for HA master etcd.
(cherry picked from commit 8f35019)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gmarek gmarek

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@jszczepkowski @gmarek @fgrzadkowski @k8s-bot @k8s-github-robot @k8s-cherrypick-bot @pwittrock @googlebot