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

Backport etcd.manifest fixes for HA clusters from #61241 to 1.9 #61956

Merged
merged 1 commit into from
Apr 9, 2018
Merged

Backport etcd.manifest fixes for HA clusters from #61241 to 1.9 #61956

merged 1 commit into from
Apr 9, 2018

Conversation

jpbetz
Copy link
Contributor

@jpbetz jpbetz commented Mar 30, 2018

Backport the etcd.manifest changes from #61241 to kubernetes 1.9. This fixes GCE configurations using HA etcd with k8s.gcr.io/etcd images built from #61241 (k8s.gcr.io/etcd:e.g. 3.1.13-0).

Note: I am not including the #60422 fix to use host_ip instead of hostname in this backport, which is required for running etcd 3.2+. We might need that, but I'd like backport it in a separate PR if we do.

Fix GCE etcd scripts to pass in all required parameters for the etcd migration utility to correctly perform HA upgrades and downgrades

@jpbetz jpbetz added kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. area/etcd area/platform/gce sig/gcp labels Mar 30, 2018
@jpbetz jpbetz added this to the v1.9 milestone Mar 30, 2018
@jpbetz jpbetz self-assigned this Mar 30, 2018
@jpbetz jpbetz requested a review from wojtek-t March 30, 2018 20:00
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 30, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 30, 2018
@k8s-github-robot k8s-github-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. milestone/needs-approval labels Mar 30, 2018
@eparis
Copy link
Contributor

eparis commented Mar 30, 2018

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2018
@jpbetz jpbetz force-pushed the migrate-if-needed-ha-fix-1.9 branch from a06a973 to 5f13389 Compare March 30, 2018 21:11
@wojtek-t
Copy link
Member

wojtek-t commented Apr 4, 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 Apr 4, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eparis, jpbetz, wojtek-t

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

@jpbetz jpbetz added cherrypick-candidate and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Apr 7, 2018
@k8s-github-robot k8s-github-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. and removed milestone/needs-approval labels Apr 7, 2018
@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@jpbetz @wojtek-t

Pull Request Labels
  • sig/gcp: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 9, 2018
@wojtek-t wojtek-t removed cherrypick-candidate do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Apr 9, 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.

@k8s-github-robot k8s-github-robot merged commit 9c37699 into kubernetes:release-1.9 Apr 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

@eparis eparis Awaiting requested review from eparis

@mikedanese mikedanese Awaiting requested review from mikedanese

Assignees

@jpbetz jpbetz

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/etcd area/platform/gce cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.
5 participants
@jpbetz @eparis @wojtek-t @k8s-ci-robot @k8s-github-robot