Skip to content

Fix for deleting hostvethpair in transparent mode #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Fix for deleting hostvethpair in transparent mode #775

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions network/transparent_endpointclient_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

const (
virtualGwIPString = "169.254.1.1/32"
defaultGwCidr = "0.0.0.0/0"
defaultGw = "0.0.0.0"
defaultGwCidr = "0.0.0.0/0"
defaultGw = "0.0.0.0"
)

type TransparentEndpointClient struct {
Expand Down Expand Up @@ -152,8 +152,8 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
for _, ipAddr := range epInfo.IPAddresses {
_, ipnet, _ := net.ParseCIDR(ipAddr.String())
routeInfo := RouteInfo{
Dst: *ipnet,
Scope: netlink.RT_SCOPE_LINK,
Dst: *ipnet,
Scope: netlink.RT_SCOPE_LINK,
Protocol: netlink.RTPROT_KERNEL,
}
if err := deleteRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
Expand All @@ -165,7 +165,7 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
//ip route add 169.254.1.1/32 dev eth0
virtualGwIP, virtualGwNet, _ := net.ParseCIDR(virtualGwIPString)
routeInfo := RouteInfo{
Dst: *virtualGwNet,
Dst: *virtualGwNet,
Scope: netlink.RT_SCOPE_LINK,
}
if err := addRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
Expand All @@ -177,7 +177,7 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
dstIP := net.IPNet{IP: net.ParseIP(defaultGw), Mask: defaultIPNet.Mask}
routeInfo = RouteInfo{
Dst: dstIP,
Gw: virtualGwIP,
Gw: virtualGwIP,
}
if err := addRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
return err
Expand All @@ -189,12 +189,5 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
}

func (client *TransparentEndpointClient) DeleteEndpoints(ep *endpoint) error {
log.Printf("[net] Deleting veth pair %v %v.", ep.HostIfName, ep.IfName)
err := netlink.DeleteLink(ep.HostIfName)
if err != nil {
log.Printf("[net] Failed to delete veth pair %v: %v.", ep.HostIfName, err)
return err
}

return nil
}