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

Don't panic when an etcd cluster is added #6180

Merged
merged 1 commit into from
Dec 21, 2018
Merged

Don't panic when an etcd cluster is added #6180

merged 1 commit into from
Dec 21, 2018

Conversation

justinsb
Copy link
Member

@justinsb justinsb commented Dec 7, 2018

Not entirely clear what validation we should do here, but we shouldn't panic!

Fix #6133

@justinsb
Don't panic when an etcd cluster is added
65713c2 
Not entirely clear what validation we should do here, but we shouldn't panic!

Fix kubernetes#6133
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 7, 2018
@justinsb justinsb mentioned this pull request Dec 7, 2018
Closed
@justinsb
Copy link
Member Author

justinsb commented Dec 7, 2018

/hold

for input on #6133

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2018
mikesplain
mikesplain approved these changes Dec 7, 2018
View reviewed changes
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just looking at this too! Good fix!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 7, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, mikesplain

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:
  • OWNERS [justinsb,mikesplain]

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

@justinsb
Copy link
Member Author

justinsb commented Dec 7, 2018

lol - thanks @mikesplain ! I'm wondering whether it was adding an etcd-cluster, or whether something deeper went wrong - hoping to get some input on the original issue!

@mikesplain
Copy link
Contributor

@justinsb Whoah, that was close, good catch on the hold.

Yeah I was working on a similar fix. Hopefully this should at least be a stopgap for now.

@justinsb
Copy link
Member Author

Going to remove hold, we want this in 1.12. I guess we want it in 1.11 also.

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 21, 2018
@k8s-ci-robot k8s-ci-robot merged commit 185b55f into kubernetes:master Dec 21, 2018
@justinsb justinsb mentioned this pull request Feb 28, 2019
Merged
justinsb added a commit that referenced this pull request Feb 28, 2019
@justinsb
Merge pull request #6540 from justinsb/cherrypick_6180_release-1.11
538740e 
Cherry pick of #6180 onto release-1.11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikesplain mikesplain mikesplain approved these changes

@chrisz100 chrisz100 Awaiting requested review from chrisz100

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@mikesplain mikesplain

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@justinsb @k8s-ci-robot @mikesplain