Skip to content

K
k3s
Commit bde909c5 authored by Robert Pothier's avatar Robert Pothier
Browse files
Options

Fixes an issue in cide_set.go

Function getBeginingAndEndIndices may return end index too big
parent 190a0cab
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/controller/node/cidr_set.go
View file @ bde909c5
...@@ -79,7 +79,7 @@ func (s *cidrSet) allocateNext() (*net.IPNet, error) { ...@@ -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()
......
pkg/controller/node/cidr_set_test.go
View file @ bde909c5
...@@ -249,7 +249,7 @@ func TestOccupy(t *testing.T) { ...@@ -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) { ...@@ -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,
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment