Skip to content

Add IPv6 support and multiple CIDR support to SubnetAllocator #66

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

Merged
openshift-merge-robot merged 4 commits into from
Nov 8, 2019
Merged

Add IPv6 support and multiple CIDR support to SubnetAllocator #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e670a09
Improve subnet_allocator_test.go
danwinship Oct 25, 2019
e70fe9f
Move multiple-CIDR-range support from OsdnMaster to SubnetAllocator
danwinship Nov 1, 2019
f78571d
Add IPv6 support to SubnetAllocator
danwinship Oct 27, 2019
fec1c5f
Move SubnetAllocator into a subdirectory
danwinship Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkg/network/master/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
networkinformers "github.com/openshift/client-go/network/informers/externalversions/network/v1"
"github.com/openshift/library-go/pkg/network/networkutils"
"github.com/openshift/sdn/pkg/network/common"
masterutil "github.com/openshift/sdn/pkg/network/master/util"
)

const (
Expand All @@ -38,9 +39,7 @@ type OsdnMaster struct {
netNamespaceInformer networkinformers.NetNamespaceInformer

// Used for allocating subnets in order
subnetAllocatorList []*SubnetAllocator
// Used for clusterNetwork --> subnetAllocator lookup
subnetAllocatorMap map[common.ParsedClusterNetworkEntry]*SubnetAllocator
subnetAllocator *masterutil.SubnetAllocator

// Holds Node IP used in creating host subnet for a node
hostSubnetNodeIPs map[ktypes.UID]string
Expand All @@ -66,8 +65,7 @@ func Start(networkClient networkclient.Interface, kClient kclientset.Interface,
hostSubnetInformer: networkInformers.Network().V1().HostSubnets(),
netNamespaceInformer: networkInformers.Network().V1().NetNamespaces(),

subnetAllocatorMap: map[common.ParsedClusterNetworkEntry]*SubnetAllocator{},
hostSubnetNodeIPs: map[ktypes.UID]string{},
hostSubnetNodeIPs: map[ktypes.UID]string{},
}

if err = master.checkClusterNetworkAgainstLocalNetworks(); err != nil {
Expand Down
234 changes: 0 additions & 234 deletions pkg/network/master/subnet_allocator.go
View file
Open in desktop

This file was deleted.

Loading