66 "net"
77 "sync"
88
9+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
910 utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1011)
1112
@@ -23,7 +24,7 @@ type SubnetAllocator struct {
2324 mutex sync.Mutex
2425}
2526
26- func NewSubnetAllocator (network string , hostBits uint32 , inUse [] string ) (* SubnetAllocator , error ) {
27+ func newSubnetAllocator (network string , hostBits uint32 ) (* SubnetAllocator , error ) {
2728 _ , netIP , err := net .ParseCIDR (network )
2829 if err != nil {
2930 return nil , fmt .Errorf ("failed to parse network address: %q" , network )
@@ -64,7 +65,7 @@ func NewSubnetAllocator(network string, hostBits uint32, inUse []string) (*Subne
6465 rightMask = 0
6566 }
6667
67- sa := & SubnetAllocator {
68+ return & SubnetAllocator {
6869 network : netIP ,
6970 hostBits : hostBits ,
7071 leftShift : leftShift ,
@@ -73,22 +74,10 @@ func NewSubnetAllocator(network string, hostBits uint32, inUse []string) (*Subne
7374 rightMask : rightMask ,
7475 next : 0 ,
7576 allocMap : make (map [string ]bool ),
76- }
77- for _ , netStr := range inUse {
78- _ , ipNet , err := net .ParseCIDR (netStr )
79- if err != nil {
80- utilruntime .HandleError (fmt .Errorf ("failed to parse network address: %s" , netStr ))
81- continue
82- }
83- if err = sa .AllocateNetwork (ipNet ); err != nil {
84- utilruntime .HandleError (err )
85- continue
86- }
87- }
88- return sa , nil
77+ }, nil
8978}
9079
91- func (sna * SubnetAllocator ) AllocateNetwork (ipNet * net.IPNet ) error {
80+ func (sna * SubnetAllocator ) markAllocatedNetwork (ipNet * net.IPNet ) error {
9281 sna .mutex .Lock ()
9382 defer sna .mutex .Unlock ()
9483
@@ -101,7 +90,7 @@ func (sna *SubnetAllocator) AllocateNetwork(ipNet *net.IPNet) error {
10190 return nil
10291}
10392
104- func (sna * SubnetAllocator ) GetNetwork () (* net.IPNet , error ) {
93+ func (sna * SubnetAllocator ) allocateNetwork () (* net.IPNet , error ) {
10594 var (
10695 numSubnets uint32
10796 numSubnetBits uint32
@@ -132,7 +121,7 @@ func (sna *SubnetAllocator) GetNetwork() (*net.IPNet, error) {
132121 return nil , ErrSubnetAllocatorFull
133122}
134123
135- func (sna * SubnetAllocator ) ReleaseNetwork (ipnet * net.IPNet ) error {
124+ func (sna * SubnetAllocator ) releaseNetwork (ipnet * net.IPNet ) error {
136125 sna .mutex .Lock ()
137126 defer sna .mutex .Unlock ()
138127
@@ -158,3 +147,88 @@ func Uint32ToIP(u uint32) net.IP {
158147 binary .BigEndian .PutUint32 (ip , u )
159148 return net .IPv4 (ip [0 ], ip [1 ], ip [2 ], ip [3 ])
160149}
150+
151+ //--------------------- Master methods ----------------------
152+
153+ func (master * OsdnMaster ) initSubnetAllocators () error {
154+ for _ , cn := range master .networkInfo .ClusterNetworks {
155+ sa , err := newSubnetAllocator (cn .ClusterCIDR .String (), cn .HostSubnetLength )
156+ if err != nil {
157+ return err
158+ }
159+ master .subnetAllocatorList = append (master .subnetAllocatorList , sa )
160+ master .subnetAllocatorMap [cn ] = sa
161+ }
162+
163+ // Populate subnet allocator
164+ subnets , err := master .networkClient .Network ().HostSubnets ().List (metav1.ListOptions {})
165+ if err != nil {
166+ return err
167+ }
168+ for _ , sn := range subnets .Items {
169+ if err := master .markAllocatedNetwork (sn .Subnet ); err != nil {
170+ utilruntime .HandleError (err )
171+ }
172+ }
173+
174+ return nil
175+ }
176+
177+ func (master * OsdnMaster ) markAllocatedNetwork (subnet string ) error {
178+ sa , ipnet , err := master .getSubnetAllocator (subnet )
179+ if err != nil {
180+ return err
181+ }
182+ if err = sa .markAllocatedNetwork (ipnet ); err != nil {
183+ return err
184+ }
185+ return nil
186+ }
187+
188+ func (master * OsdnMaster ) allocateNetwork (nodeName string ) (string , error ) {
189+ var sn * net.IPNet
190+ var err error
191+
192+ for _ , possibleSubnet := range master .subnetAllocatorList {
193+ sn , err = possibleSubnet .allocateNetwork ()
194+ if err == ErrSubnetAllocatorFull {
195+ // Current subnet exhausted, check the next one
196+ continue
197+ } else if err != nil {
198+ utilruntime .HandleError (fmt .Errorf ("Error allocating network from subnet: %v" , possibleSubnet ))
199+ continue
200+ } else {
201+ return sn .String (), nil
202+ }
203+ }
204+ return "" , fmt .Errorf ("error allocating network for node %s: %v" , nodeName , err )
205+ }
206+
207+ func (master * OsdnMaster ) releaseNetwork (subnet string ) error {
208+ sa , ipnet , err := master .getSubnetAllocator (subnet )
209+ if err != nil {
210+ return err
211+ }
212+ if err = sa .releaseNetwork (ipnet ); err != nil {
213+ return err
214+ }
215+ return nil
216+ }
217+
218+ func (master * OsdnMaster ) getSubnetAllocator (subnet string ) (* SubnetAllocator , * net.IPNet , error ) {
219+ _ , ipnet , err := net .ParseCIDR (subnet )
220+ if err != nil {
221+ return nil , nil , fmt .Errorf ("error parsing subnet %q: %v" , subnet , err )
222+ }
223+
224+ for _ , cn := range master .networkInfo .ClusterNetworks {
225+ if cn .ClusterCIDR .Contains (ipnet .IP ) {
226+ sa , ok := master .subnetAllocatorMap [cn ]
227+ if ! ok || sa == nil {
228+ return nil , nil , fmt .Errorf ("subnet allocator not found for cluster network: %v" , cn )
229+ }
230+ return sa , ipnet , nil
231+ }
232+ }
233+ return nil , nil , fmt .Errorf ("subnet %q not found in the cluster networks: %v" , subnet , master .networkInfo .ClusterNetworks )
234+ }
0 commit comments