From 99ecb4c6638074f8f444fa46e9d77679a565dccd Mon Sep 17 00:00:00 2001 From: Sri Saran Balaji Vellore Rajakumar Date: Fri, 5 Feb 2021 10:55:19 -0800 Subject: [PATCH] Fix deletion of hostVeth rule for pods using security group --- cmd/routed-eni-cni-plugin/driver/driver.go | 16 +++++++++++++++- cmd/routed-eni-cni-plugin/driver/driver_test.go | 10 +++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cmd/routed-eni-cni-plugin/driver/driver.go b/cmd/routed-eni-cni-plugin/driver/driver.go index b264593cf2..c81ce21e52 100644 --- a/cmd/routed-eni-cni-plugin/driver/driver.go +++ b/cmd/routed-eni-cni-plugin/driver/driver.go @@ -313,7 +313,7 @@ func (os *linuxNetwork) SetupPodENINetwork(hostVethName string, contVethName str vlanTableID := vlanID + 100 vlanLink := buildVlanLink(vlanID, parentIfIndex, eniMAC) - // 1. clean up if vlan already exists (necessary when trunk ENI changes). + // 1a. clean up if vlan already exists (necessary when trunk ENI changes). if oldVlan, err := os.netLink.LinkByName(vlanLink.Name); err == nil { if err = os.netLink.LinkDel(oldVlan); err != nil { return errors.Wrapf(err, "SetupPodENINetwork: failed to delete old vlan %s", vlanLink.Name) @@ -321,6 +321,20 @@ func (os *linuxNetwork) SetupPodENINetwork(hostVethName string, contVethName str log.Debugf("Cleaned up old vlan: %s", vlanLink.Name) } + // 1b. clean up any previous hostVeth ip rule + oldVlanRule := os.netLink.NewRule() + oldVlanRule.IifName = hostVethName + oldVlanRule.Priority = vlanRulePriority + // loop is required to clean up all existing rules created on the host (when pod with same name are recreated multiple times) + for { + if err := os.netLink.RuleDel(oldVlanRule); err != nil { + if !containsNoSuchRule(err) { + return errors.Wrapf(err, "SetupPodENINetwork: failed to delete hostveth rule for %s", hostVeth.Attrs().Name) + } + break + } + } + // 2. add new vlan link err = os.netLink.LinkAdd(vlanLink) if err != nil { diff --git a/cmd/routed-eni-cni-plugin/driver/driver_test.go b/cmd/routed-eni-cni-plugin/driver/driver_test.go index d2eb8957f3..f365e2975e 100644 --- a/cmd/routed-eni-cni-plugin/driver/driver_test.go +++ b/cmd/routed-eni-cni-plugin/driver/driver_test.go @@ -514,6 +514,15 @@ func (m *testMocks) mockSetupPodENINetworkWithFailureAt(t *testing.T, addr *net. m.netlink.EXPECT().LinkByName(testVlanName).Return(nil, errors.New("link not found")) + actualRule := &netlink.Rule{} + m.netlink.EXPECT().NewRule().Return(actualRule) + + oldVethRule := &netlink.Rule{ + IifName: testHostVethName, + Priority: vlanRulePriority, + } + m.netlink.EXPECT().RuleDel(gomock.Eq(oldVethRule)).Return(syscall.ENOENT) + vlanLink := buildVlanLink(1, 2, "eniMacAddress") // add the link m.netlink.EXPECT().LinkAdd(gomock.Eq(vlanLink)).Return(nil) @@ -544,7 +553,6 @@ func (m *testMocks) mockSetupPodENINetworkWithFailureAt(t *testing.T, addr *net. } m.netlink.EXPECT().RouteReplace(gomock.Eq(&route)).Return(nil) - actualRule := &netlink.Rule{} m.netlink.EXPECT().NewRule().Return(actualRule) // add two ip rules based on iff interfaces