github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Fixes an issue in cide_set.go

Browse Source 
Function getBeginingAndEndIndices may return
end index too big
This commit is contained in:
Robert Pothier
2017-04-17 11:08:19 -04:00
parent 190a0cab89
commit bde909c55b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/node/cidr_set.go
View File

@@ -79,7 +79,7 @@ func (s *cidrSet) allocateNext() (*net.IPNet, error) {
} }
func (s *cidrSet) getBeginingAndEndIndices(cidr *net.IPNet) (begin, end int, err error) { func (s *cidrSet) getBeginingAndEndIndices(cidr *net.IPNet) (begin, end int, err error) {
begin, end = 0, s.maxCIDRs begin, end = 0, s.maxCIDRs-1
cidrMask := cidr.Mask cidrMask := cidr.Mask
maskSize, _ := cidrMask.Size() maskSize, _ := cidrMask.Size()

4
pkg/controller/node/cidr_set_test.go
View File

@@ -249,7 +249,7 @@ func TestOccupy(t *testing.T) {
subNetMaskSize: 16, subNetMaskSize: 16,
subNetCIDRStr: "127.0.0.0/8", subNetCIDRStr: "127.0.0.0/8",
expectedUsedBegin: 0, expectedUsedBegin: 0,
expectedUsedEnd: 256, expectedUsedEnd: 255,
expectErr: false, expectErr: false,
}, },
{ {
@@ -257,7 +257,7 @@ func TestOccupy(t *testing.T) {
subNetMaskSize: 16, subNetMaskSize: 16,
subNetCIDRStr: "127.0.0.0/2", subNetCIDRStr: "127.0.0.0/2",
expectedUsedBegin: 0, expectedUsedBegin: 0,
expectedUsedEnd: 256, expectedUsedEnd: 255,
expectErr: false, expectErr: false,
}, },
{ {