github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47621 from danehans/ipallocator

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Updates RangeSize error message and tests for IPv6.

**What this PR does / why we need it**:
Updates the RangeSize function's error message and tests for IPv6. Converts RangeSize unit test to a table test and tests for success and failure cases. This is needed to support IPv6. Previously, it was unclear whether RangeSize supported IPv6 CIDRs. These updates make IPv6 support explicit.

**Which issue this PR fixes**
Partially fixes Issue #1443

**Special notes for your reviewer**:
/area ipv6

**Release note**:
```NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-13 01:19:26 -07:00 committed by GitHub
commit e51e714ae3
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/core/service/ipallocator/allocator.go
View File

@ -263,8 +263,8 @@ func calculateIPOffset(base *big.Int, ip net.IP) int {
// RangeSize returns the size of a range in valid addresses. // RangeSize returns the size of a range in valid addresses.
func RangeSize(subnet *net.IPNet) int64 { func RangeSize(subnet *net.IPNet) int64 {
ones, bits := subnet.Mask.Size() ones, bits := subnet.Mask.Size()
if (bits - ones) >= 31 { if bits == 32 && (bits-ones) >= 31 || bits == 128 && (bits-ones) >= 63 {
panic("masks greater than 31 bits are not supported") return 0
} }
max := int64(1) << uint(bits-ones) max := int64(1) << uint(bits-ones)
return max return max

41
pkg/registry/core/service/ipallocator/allocator_test.go
View File

@ -166,18 +166,41 @@ func TestAllocateSmall(t *testing.T) {
} }
func TestRangeSize(t *testing.T) { func TestRangeSize(t *testing.T) {
testCases := map[string]int64{ testCases := []struct {
"192.168.1.0/24": 256, name string
"192.168.1.0/32": 1, cidr string
"192.168.1.0/31": 2, addrs int64
}{
{
name: "supported IPv4 cidr",
cidr: "192.168.1.0/24",
addrs: 256,
},
{
name: "unsupported IPv4 cidr",
cidr: "192.168.1.0/1",
addrs: 0,
},
{
name: "supported IPv6 cidr",
cidr: "2001:db8::/98",
addrs: 1073741824,
},
{
name: "unsupported IPv6 mask",
cidr: "2001:db8::/65",
addrs: 0,
},
} }
for k, v := range testCases {
_, cidr, err := net.ParseCIDR(k) for _, tc := range testCases {
_, cidr, err := net.ParseCIDR(tc.cidr)
if err != nil { if err != nil {
t.Fatal(err) t.Errorf("failed to parse cidr for test %s, unexpected error: '%s'", tc.name, err)
} }
if size := RangeSize(cidr); size != v { if size := RangeSize(cidr); size != tc.addrs {
t.Errorf("%s should have a range size of %d, got %d", k, v, size) t.Errorf("test %s failed. %s should have a range size of %d, got %d",
tc.name, tc.cidr, tc.addrs, size)
} }
} }
} }