Skip to content

Commit 2ef5c49

Browse files
sushrksushrk
committed
Revert "annotate pods with v6 addr from branch ENI when present (#309)"
This reverts commit d488780.
1 parent 90aba75 commit 2ef5c49

File tree

4 files changed

+29
-109
lines changed

4 files changed

+29
-109
lines changed

‎mocks/amazon-vcp-resource-controller-k8s/pkg/aws/ec2/mock_instance.go

-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/aws/ec2/instance.go

+4-33
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,15 @@ type ec2Instance struct {
3838
// subnetId is the instance's subnet id
3939
instanceSubnetID string
4040
// instanceSubnetCidrBlock is the cidr block of the instance's subnet
41-
instanceSubnetCidrBlock string
42-
instanceSubnetV6CidrBlock string
41+
instanceSubnetCidrBlock string
4342
// currentSubnetID can either point to the Subnet ID of the instance or subnet ID from the ENIConfig
4443
currentSubnetID string
4544
// currentSubnetCIDRBlock can either point to the Subnet CIDR block for instance subnet or subnet from ENIConfig
46-
currentSubnetCIDRBlock string
47-
currentSubnetV6CIDRBlock string
45+
currentSubnetCIDRBlock string
4846
// currentInstanceSecurityGroups can either point to the primary network interface security groups or the security groups in ENIConfig
4947
currentInstanceSecurityGroups []string
5048
// subnetMask is the mask of the subnet CIDR block
51-
subnetMask string
52-
subnetV6Mask string
49+
subnetMask string
5350
// deviceIndexes is the list of indexes used by the EC2 Instance
5451
deviceIndexes []bool
5552
// primaryENIGroups is the security group used by the primary network interface
@@ -73,9 +70,7 @@ type EC2Instance interface {
7370
InstanceID() string
7471
SubnetID() string
7572
SubnetMask() string
76-
SubnetV6Mask() string
7773
SubnetCidrBlock() string
78-
SubnetV6CidrBlock() string
7974
PrimaryNetworkInterfaceID() string
8075
CurrentInstanceSecurityGroups() []string
8176
SetNewCustomNetworkingSpec(subnetID string, securityGroup []string)
@@ -115,16 +110,8 @@ func (i *ec2Instance) LoadDetails(ec2APIHelper api.EC2APIHelper) error {
115110
i.instanceSubnetID, i.instanceID)
116111
}
117112
i.instanceSubnetCidrBlock = *instanceSubnet.CidrBlock
118-
i.subnetMask = strings.Split(i.instanceSubnetCidrBlock, "/")[1]
119-
// Cache IPv6 CIDR block if one is present
120-
for _, v6CidrBlock := range instanceSubnet.Ipv6CidrBlockAssociationSet {
121-
if v6CidrBlock.Ipv6CidrBlock != nil {
122-
i.instanceSubnetV6CidrBlock = *v6CidrBlock.Ipv6CidrBlock
123-
i.subnetV6Mask = strings.Split(i.instanceSubnetV6CidrBlock, "/")[1]
124-
break
125-
}
126-
}
127113

114+
i.subnetMask = strings.Split(i.instanceSubnetCidrBlock, "/")[1]
128115
i.instanceType = *instance.InstanceType
129116
limits, ok := vpc.Limits[i.instanceType]
130117
if !ok {
@@ -191,13 +178,6 @@ func (i *ec2Instance) SubnetCidrBlock() string {
191178
return i.currentSubnetCIDRBlock
192179
}
193180

194-
func (i *ec2Instance) SubnetV6CidrBlock() string {
195-
i.lock.RLock()
196-
defer i.lock.RUnlock()
197-
198-
return i.currentSubnetV6CIDRBlock
199-
}
200-
201181
// Name returns the name of the node
202182
func (i *ec2Instance) Name() string {
203183
return i.name
@@ -251,13 +231,6 @@ func (i *ec2Instance) SubnetMask() string {
251231
return i.subnetMask
252232
}
253233

254-
func (i *ec2Instance) SubnetV6Mask() string {
255-
i.lock.Lock()
256-
defer i.lock.Unlock()
257-
258-
return i.subnetV6Mask
259-
}
260-
261234
// SetNewCustomNetworkingSpec updates the subnet ID and subnet CIDR block for the instance
262235
func (i *ec2Instance) SetNewCustomNetworkingSpec(subnet string, securityGroups []string) {
263236
i.lock.Lock()
@@ -298,14 +271,12 @@ func (i *ec2Instance) updateCurrentSubnetAndCidrBlock(ec2APIHelper api.EC2APIHel
298271
}
299272
i.currentSubnetID = i.newCustomNetworkingSubnetID
300273
i.currentSubnetCIDRBlock = *customSubnet.CidrBlock
301-
// NOTE: IPv6 does not support custom networking
302274
}
303275
} else {
304276
// Custom networking in not being used, point to the primary network interface security group and
305277
// subnet details
306278
i.currentSubnetID = i.instanceSubnetID
307279
i.currentSubnetCIDRBlock = i.instanceSubnetCidrBlock
308-
i.currentSubnetV6CIDRBlock = i.instanceSubnetV6CidrBlock
309280
i.currentInstanceSecurityGroups = i.primaryENISecurityGroups
310281
}
311282

‎pkg/provider/branch/trunk/trunk.go

+4-14
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,12 @@ type ENIDetails struct {
127127
ID string `json:"eniId"`
128128
// MacAdd is the MAC address of the network interface
129129
MACAdd string `json:"ifAddress"`
130-
// IPv4 and/or IPv6 address assigned to the branch Network interface
130+
// BranchIp is the primary IP of the branch Network interface
131131
IPV4Addr string `json:"privateIp"`
132-
IPV6Addr string `json:"ipv6Addr"`
133132
// VlanId is the VlanId of the branch network interface
134133
VlanID int `json:"vlanId"`
135134
// SubnetCIDR is the CIDR block of the subnet
136-
SubnetCIDR string `json:"subnetCidr"`
137-
SubnetV6CIDR string `json:"subnetV6Cidr"`
135+
SubnetCIDR string `json:"subnetCidr"`
138136
// deletionTimeStamp is the time when the pod was marked deleted.
139137
deletionTimeStamp time.Time
140138
// deleteRetryCount is the
@@ -385,17 +383,9 @@ func (t *trunkENI) CreateAndAssociateBranchENIs(pod *v1.Pod, securityGroups []st
385383
branchENIOperationsSuccessCount.WithLabelValues("created_branch_eni_succeeded").Inc()
386384
}
387385

388-
// Branch ENI can have an IPv4 address, IPv6 address, or both
389-
var v4Addr, v6Addr string
390-
if nwInterface.PrivateIpAddress != nil {
391-
v4Addr = *nwInterface.PrivateIpAddress
392-
}
393-
if nwInterface.Ipv6Address != nil {
394-
v6Addr = *nwInterface.Ipv6Address
395-
}
396386
newENI := &ENIDetails{ID: *nwInterface.NetworkInterfaceId, MACAdd: *nwInterface.MacAddress,
397-
IPV4Addr: v4Addr, IPV6Addr: v6Addr, SubnetCIDR: t.instance.SubnetCidrBlock(),
398-
SubnetV6CIDR: t.instance.SubnetV6CidrBlock(), VlanID: vlanID}
387+
IPV4Addr: *nwInterface.PrivateIpAddress, SubnetCIDR: t.instance.SubnetCidrBlock(), VlanID: vlanID}
388+
399389
newENIs = append(newENIs, newENI)
400390

401391
// Associate Branch to trunk

‎pkg/provider/branch/trunk/trunk_test.go

+21-34
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ var (
4040
InstanceType = "c5.xlarge"
4141
SubnetId = "subnet-00000000000000000"
4242
SubnetCidrBlock = "192.168.0.0/16"
43-
SubnetV6CidrBlock = "2600::/64"
4443
NodeName = "test-node"
4544
FakeInstance = ec2.NewEC2Instance(NodeName, InstanceId, config.OSLinux)
4645
InstanceSecurityGroup = []string{"sg-1", "sg-2"}
@@ -57,9 +56,9 @@ var (
5756
UID: MockPodUID1,
5857
Name: MockPodName1,
5958
Namespace: MockPodNamespace1,
60-
Annotations: map[string]string{config.ResourceNamePodENI: "[{\"eniId\":\"eni-00000000000000000\",\"ifAddress\":\"FF:FF:FF:FF:FF:FF\",\"privateIp\":\"192.168.0.15\"," +
61-
"\"ipv6Addr\":\"2600::\",\"vlanId\":1,\"subnetCidr\":\"192.168.0.0/16\",\"subnetV6Cidr\":\"2600::/64\"},{\"eniId\":\"eni-00000000000000001\",\"ifAddress\":\"" +
62-
"FF:FF:FF:FF:FF:F9\",\"privateIp\":\"192.168.0.16\",\"ipv6Addr\":\"2600::1\",\"vlanId\":2,\"subnetCidr\":\"192.168.0.0/16\",\"subnetV6Cidr\":\"2600::/64\"}]"}},
59+
Annotations: map[string]string{config.ResourceNamePodENI: "[{\"eniId\":\"eni-00000000000000000\",\"ifAddress\":\"FF:FF:FF:FF:FF:FF\",\"privateIp\":\"192.168.0.15\"" +
60+
",\"vlanId\":1,\"subnetCidr\":\"192.168.0.0/16\"},{\"eniId\":\"eni-00000000000000001\",\"ifAddress\":\"" +
61+
"FF:FF:FF:FF:FF:F9\",\"privateIp\":\"192.168.0.16\",\"vlanId\":2,\"subnetCidr\":\"192.168.0.0/16\"}]"}},
6362
Spec: v1.PodSpec{NodeName: NodeName},
6463
Status: v1.PodStatus{},
6564
}
@@ -89,20 +88,17 @@ var (
8988
SecurityGroups = []string{SecurityGroup1, SecurityGroup2}
9089

9190
// Branch Interface 1
92-
Branch1Id = "eni-00000000000000000"
93-
MacAddr1 = "FF:FF:FF:FF:FF:FF"
94-
BranchIp1 = "192.168.0.15"
95-
BranchV6Ip1 = "2600::"
96-
VlanId1 = 1
91+
Branch1Id = "eni-00000000000000000"
92+
MacAddr1 = "FF:FF:FF:FF:FF:FF"
93+
BranchIp1 = "192.168.0.15"
94+
VlanId1 = 1
9795

9896
EniDetails1 = &ENIDetails{
99-
ID: Branch1Id,
100-
MACAdd: MacAddr1,
101-
IPV4Addr: BranchIp1,
102-
IPV6Addr: BranchV6Ip1,
103-
VlanID: VlanId1,
104-
SubnetCIDR: SubnetCidrBlock,
105-
SubnetV6CIDR: SubnetV6CidrBlock,
97+
ID: Branch1Id,
98+
MACAdd: MacAddr1,
99+
IPV4Addr: BranchIp1,
100+
VlanID: VlanId1,
101+
SubnetCIDR: SubnetCidrBlock,
106102
}
107103

108104
branchENIs1 = []*ENIDetails{EniDetails1}
@@ -111,31 +107,26 @@ var (
111107
MacAddress: &MacAddr1,
112108
NetworkInterfaceId: &Branch1Id,
113109
PrivateIpAddress: &BranchIp1,
114-
Ipv6Address: &BranchV6Ip1,
115110
}
116111

117112
// Branch Interface 2
118-
Branch2Id = "eni-00000000000000001"
119-
MacAddr2 = "FF:FF:FF:FF:FF:F9"
120-
BranchIp2 = "192.168.0.16"
121-
BranchV6Ip2 = "2600::1"
122-
VlanId2 = 2
113+
Branch2Id = "eni-00000000000000001"
114+
MacAddr2 = "FF:FF:FF:FF:FF:F9"
115+
BranchIp2 = "192.168.0.16"
116+
VlanId2 = 2
123117

124118
EniDetails2 = &ENIDetails{
125-
ID: Branch2Id,
126-
MACAdd: MacAddr2,
127-
IPV4Addr: BranchIp2,
128-
IPV6Addr: BranchV6Ip2,
129-
VlanID: VlanId2,
130-
SubnetCIDR: SubnetCidrBlock,
131-
SubnetV6CIDR: SubnetV6CidrBlock,
119+
ID: Branch2Id,
120+
MACAdd: MacAddr2,
121+
IPV4Addr: BranchIp2,
122+
VlanID: VlanId2,
123+
SubnetCIDR: SubnetCidrBlock,
132124
}
133125

134126
BranchInterface2 = &awsEc2.NetworkInterface{
135127
MacAddress: &MacAddr2,
136128
NetworkInterfaceId: &Branch2Id,
137129
PrivateIpAddress: &BranchIp2,
138-
Ipv6Address: &BranchV6Ip2,
139130
}
140131

141132
branchENIs2 = []*ENIDetails{EniDetails2}
@@ -734,7 +725,6 @@ func TestTrunkENI_CreateAndAssociateBranchENIs(t *testing.T) {
734725
mockInstance.EXPECT().Type().Return(InstanceType)
735726
mockInstance.EXPECT().SubnetID().Return(SubnetId).Times(2)
736727
mockInstance.EXPECT().SubnetCidrBlock().Return(SubnetCidrBlock).Times(2)
737-
mockInstance.EXPECT().SubnetV6CidrBlock().Return(SubnetV6CidrBlock).Times(2)
738728

739729
mockEC2APIHelper.EXPECT().CreateNetworkInterface(&BranchEniDescription, &SubnetId, SecurityGroups,
740730
vlan1Tag, nil, nil).Return(BranchInterface1, nil)
@@ -767,7 +757,6 @@ func TestTrunkENI_CreateAndAssociateBranchENIs_InstanceSecurityGroup(t *testing.
767757
mockInstance.EXPECT().Type().Return(InstanceType)
768758
mockInstance.EXPECT().SubnetID().Return(SubnetId).Times(2)
769759
mockInstance.EXPECT().SubnetCidrBlock().Return(SubnetCidrBlock).Times(2)
770-
mockInstance.EXPECT().SubnetV6CidrBlock().Return(SubnetV6CidrBlock).Times(2)
771760
mockInstance.EXPECT().CurrentInstanceSecurityGroups().Return(InstanceSecurityGroup)
772761

773762
mockEC2APIHelper.EXPECT().CreateNetworkInterface(&BranchEniDescription, &SubnetId, InstanceSecurityGroup,
@@ -801,7 +790,6 @@ func TestTrunkENI_CreateAndAssociateBranchENIs_ErrorAssociate(t *testing.T) {
801790
mockInstance.EXPECT().Type().Return(InstanceType)
802791
mockInstance.EXPECT().SubnetID().Return(SubnetId).Times(2)
803792
mockInstance.EXPECT().SubnetCidrBlock().Return(SubnetCidrBlock).Times(2)
804-
mockInstance.EXPECT().SubnetV6CidrBlock().Return(SubnetV6CidrBlock).Times(2)
805793

806794
gomock.InOrder(
807795
mockEC2APIHelper.EXPECT().CreateNetworkInterface(&BranchEniDescription, &SubnetId, SecurityGroups,
@@ -829,7 +817,6 @@ func TestTrunkENI_CreateAndAssociateBranchENIs_ErrorCreate(t *testing.T) {
829817
mockInstance.EXPECT().Type().Return(InstanceType)
830818
mockInstance.EXPECT().SubnetID().Return(SubnetId).Times(2)
831819
mockInstance.EXPECT().SubnetCidrBlock().Return(SubnetCidrBlock).Times(1)
832-
mockInstance.EXPECT().SubnetV6CidrBlock().Return(SubnetV6CidrBlock).Times(1)
833820

834821
gomock.InOrder(
835822
mockEC2APIHelper.EXPECT().CreateNetworkInterface(&BranchEniDescription, &SubnetId, SecurityGroups, vlan1Tag,

0 commit comments

Comments
 (0)