Skip to content

Commit 79d8758

Browse files
authored
ipv6 don't reserve gateway address (#537)
1 parent d2ba9bb commit 79d8758

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

.pipelines/e2e-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
name: ""
3-
pipelineBuildImage: "containernetworking/pipeline-ci:1.0.6"
3+
pipelineBuildImage: "$(BUILD_IMAGE)"
44
clusterDefinition: ""
55
clusterDefinitionCniTypeKey: ""
66
clusterDefinitionCniBuildOS: ""

ipam/ipv6Ipam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func retrieveKubernetesPodIPs(node *v1.Node, subnetMaskBitSize string) (*Network
245245
}
246246

247247
// skip the first address, explicitly save all IP's from the given subnet
248-
for i := 1; i < len(addresses); i++ {
248+
for i := 2; i < len(addresses); i++ {
249249
ipaddress := IPAddress{
250250
IsPrimary: false,
251251
Address: addresses[i].String(),

ipam/ipv6Ipam_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func TestIPv6Ipam(t *testing.T) {
5656
{
5757
Prefix: "ace:cab:deca:deed::/126",
5858
IPAddresses: []IPAddress{
59-
{Address: "ace:cab:deca:deed::1", IsPrimary: false},
6059
{Address: "ace:cab:deca:deed::2", IsPrimary: false},
6160
{Address: "ace:cab:deca:deed::3", IsPrimary: false},
6261
},

ipam/manager_ipv6Ipam_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var (
1313

1414
// Pools and addresses used by tests.
1515
ipv6subnet1 = "ace:cab:deca:deed::" + testSubnetSize
16-
ipv6addr1 = "ace:cab:deca:deed::1"
1716
ipv6addr2 = "ace:cab:deca:deed::2"
1817
ipv6addr3 = "ace:cab:deca:deed::3"
1918
)
@@ -73,16 +72,6 @@ func TestIPv6GetAddressPoolAndAddress(t *testing.T) {
7372
t.Errorf("Mismatched retrieved subnet, expected:%+v, actual %+v", ipv6subnet1, subnet1)
7473
}
7574

76-
// test with no specified address
77-
address1, err := am.RequestAddress(LocalDefaultAddressSpaceId, poolID1, ipv6addr1, nil)
78-
if err != nil {
79-
t.Errorf("RequestAddress failed, err:%v", err)
80-
}
81-
82-
if address1 != ipv6addr1+testSubnetSize {
83-
t.Errorf("RequestAddress failed, expected: %v, actual: %v", ipv6addr1+testSubnetSize, address1)
84-
}
85-
8675
// test with a specified address
8776
address2, err := am.RequestAddress(LocalDefaultAddressSpaceId, poolID1, ipv6addr2, nil)
8877
if err != nil {
@@ -103,12 +92,6 @@ func TestIPv6GetAddressPoolAndAddress(t *testing.T) {
10392
t.Errorf("RequestAddress failed, expected: %v, actual: %v", ipv6addr3+testSubnetSize, address3)
10493
}
10594

106-
// Release addresses and the pool.
107-
err = am.ReleaseAddress(LocalDefaultAddressSpaceId, poolID1, address1, nil)
108-
if err != nil {
109-
t.Errorf("ReleaseAddress failed, err:%v", err)
110-
}
111-
11295
// Release addresses and the pool.
11396
err = am.ReleaseAddress(LocalDefaultAddressSpaceId, poolID1, address2, nil)
11497
if err != nil {

0 commit comments

Comments
 (0)