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.

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

Remove numerous "Provided subnet doesn't belong to network" when configured with multiple subnets #17973

Merged
merged 1 commit into from
Jan 10, 2018

Conversation

JacobTanenbaum
Copy link
Contributor

@JacobTanenbaum JacobTanenbaum commented Jan 3, 2018

If there are multiple clusterNetworkCIDR values on startup when generating the SubnetAllocators for each range "Provided subnet doesn't belong to network" gets printed after each subnet that belongs to a different range.

I sorted the list of subnets so that each call to NewSubnetAllocator has the list of subnets that are within the clusterNetworkCIDR's range

Fixes #17475

If there are multiple clusterNetworkCIDR values on startup when generating the SubnetAllocators for each range
"Provided subnet doesn't belong to network" gets printed after each subnet that belongs to a different range.

I sorted the list of subnets so that each call to NewSubnetAllocator has the list of subnets that are within the clusterNetworkCIDR's range
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 3, 2018
Copy link
Contributor

@rajatchopra rajatchopra left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JacobTanenbaum, rajatchopra

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2018
@openshift-bot
Copy link
Contributor

/retest

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

@danwinship
Copy link
Contributor

Please set a better title for the PR so it's recognizable in search results, etc

Also, if you say:

Fixes #17475

in the initial comment, then github will automatically close that issue when this PR is merged. (I think it only works if that's in the initial comment though, so my saying it here won't work. But you can edit the initial comment to fix it.)

subrange[cn] = append(subrange[cn], sub.Subnet)
break
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Hm... this would end up skipping the subnet if it doesn't match any ClusterNetwork, but we already sanity-checked the HostSubnets before this anyway so I guess that's ok.

@danwinship
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@JacobTanenbaum
Copy link
Contributor Author

/retest

@JacobTanenbaum JacobTanenbaum changed the title fix github issue 17475 Remove numerous "Provided subnet doesn't belong to network" when configured with multiple subnets Jan 8, 2018
Copy link

@pravisankar pravisankar left a comment

Choose a reason for hiding this comment

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

LGTM

@JacobTanenbaum
Copy link
Contributor Author

flakes: #17901 #17970 #17882 #16994
/retest

@JacobTanenbaum
Copy link
Contributor Author

/retest

1 similar comment
@knobunc
Copy link
Contributor

knobunc commented Jan 9, 2018

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit a90f8af into openshift:master Jan 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/networking lgtm Indicates that a PR is ready to be merged. sig/networking size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants