Add IPv6 support and multiple CIDR support to SubnetAllocator#66
Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom Nov 8, 2019
Merged
Conversation
Contributor
Author
|
/cc @russellb |
0181b48 to
657ee53
Compare
|
/cc @markmc |
657ee53 to
594bd97
Compare
A copy of the code is used by ovn-kubernetes too, so make it more shareable again.
594bd97 to
fec1c5f
Compare
Contributor
Author
|
updated to skip the 0 subnet on IPv6, because it's weird that pod IPs on the first node look like "fd01::P", but pod IPs on all other nodes look like "fd01:0:0:S::P" |
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danwinship, markmc The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
|
/retest Please review the full test history for this PR and help us cut down flakes. |
markmc
added a commit
to markmc/ovn-kubernetes
that referenced
this pull request
Nov 29, 2019
Pulls in changes to support multiple subnets and to support IPv6: openshift/sdn#66
markmc
added a commit
to openshift-kni/ovn-kubernetes
that referenced
this pull request
Nov 29, 2019
Pulls in changes to support multiple subnets and to support IPv6: openshift/sdn#66
danwinship
pushed a commit
to danwinship/ovn-kubernetes-1
that referenced
this pull request
Feb 15, 2020
Pulls in changes to support multiple subnets and to support IPv6: openshift/sdn#66
danwinship
pushed a commit
to danwinship/ovn-kubernetes-1
that referenced
this pull request
Feb 16, 2020
Pulls in changes to support multiple subnets and to support IPv6: openshift/sdn#66
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This extends SubnetAllocator to support IPv6 ClusterNetworkCIDRs, and then also moves the code from OsdnMaster for handling multiple subnets and makes it part of SubnetAllocator instead.
(Of course, with stock OCP you can't configure an IPv6 ClusterNetwork so this should have no effect on end users at this point, and thus doesn't count as a feature, and would be exempt on IPv6 grounds even if it did.)
ovn-kubernetes currently vendors an older copy of SubnetAllocator (via
"github.com/openshift/origin/pkg/util/netutils") and then independently reimplements the multiple CIDR stuff on top of that. My intention was that it could be updated to either copy+paste or vendor this version instead, to provide IPv6 support there as well (and to remove the duplicated multiple CIDR code).