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

Fix crash with invalid serviceNetworkCIDR #17117

Merged
merged 1 commit into from
Nov 1, 2017
Merged

Fix crash with invalid serviceNetworkCIDR #17117

merged 1 commit into from
Nov 1, 2017

Conversation

danwinship
Copy link
Contributor

#17076 fixed the corresponding crash with clusterNetworkCIDR, but serviceNetworkCIDR had the same problem. Also, this slightly simplifies the previous fix.

@danwinship danwinship added component/networking kind/bug Categorizes issue or PR as related to a bug. sig/networking labels Oct 31, 2017
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 31, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 31, 2017
@danwinship
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 31, 2017
@danwinship
Copy link
Contributor Author

/hold cancel

Since 3.5 corrected the values before storing them into etcd but 3.6 did not (originally, but soon will), we have to be able to deal with both versions.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2017
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 31, 2017
@danwinship
Copy link
Contributor Author

Since 3.5 corrected the values before storing them into etcd but 3.6 did not (originally, but soon will), we have to be able to deal with both versions.

Sigh, no, actually; 3.6 would always either Fatalf or panic if you gave it invalid CIDRs. So we don't need to be able to handle bad values in etcd, so I've removed the second patch again

@pravisankar
Copy link

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@pravisankar
Copy link

/retest

1 similar comment
@pravisankar
Copy link

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@knobunc
Copy link
Contributor

knobunc commented Nov 1, 2017

/retest

knobunc
knobunc approved these changes Nov 1, 2017
View reviewed changes
Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Thanks for hopping on this one Dan.

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, knobunc, pravisankar

The full list of commands accepted by this bot can be found here.

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

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit af9d638 into openshift:master Nov 1, 2017
@danwinship danwinship deleted the cidr-checks branch November 6, 2017 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pravisankar pravisankar pravisankar approved these changes

@knobunc knobunc knobunc approved these changes

Assignees

@pravisankar pravisankar

@knobunc knobunc

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/networking kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. sig/networking 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.
6 participants
@danwinship @pravisankar @openshift-bot @knobunc @openshift-merge-robot @openshift-ci-robot