Skip to content

Commit 8307081

Browse files
not necessary to delete hostveth as it goes away when container namespace is deleted (#775)
1 parent 599ea8f commit 8307081

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

network/transparent_endpointclient_linux.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
const (
1414
virtualGwIPString = "169.254.1.1/32"
15-
defaultGwCidr = "0.0.0.0/0"
16-
defaultGw = "0.0.0.0"
15+
defaultGwCidr = "0.0.0.0/0"
16+
defaultGw = "0.0.0.0"
1717
)
1818

1919
type TransparentEndpointClient struct {
@@ -152,8 +152,8 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
152152
for _, ipAddr := range epInfo.IPAddresses {
153153
_, ipnet, _ := net.ParseCIDR(ipAddr.String())
154154
routeInfo := RouteInfo{
155-
Dst: *ipnet,
156-
Scope: netlink.RT_SCOPE_LINK,
155+
Dst: *ipnet,
156+
Scope: netlink.RT_SCOPE_LINK,
157157
Protocol: netlink.RTPROT_KERNEL,
158158
}
159159
if err := deleteRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
@@ -165,7 +165,7 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
165165
//ip route add 169.254.1.1/32 dev eth0
166166
virtualGwIP, virtualGwNet, _ := net.ParseCIDR(virtualGwIPString)
167167
routeInfo := RouteInfo{
168-
Dst: *virtualGwNet,
168+
Dst: *virtualGwNet,
169169
Scope: netlink.RT_SCOPE_LINK,
170170
}
171171
if err := addRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
@@ -177,7 +177,7 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
177177
dstIP := net.IPNet{IP: net.ParseIP(defaultGw), Mask: defaultIPNet.Mask}
178178
routeInfo = RouteInfo{
179179
Dst: dstIP,
180-
Gw: virtualGwIP,
180+
Gw: virtualGwIP,
181181
}
182182
if err := addRoutes(client.containerVethName, []RouteInfo{routeInfo}); err != nil {
183183
return err
@@ -189,12 +189,5 @@ func (client *TransparentEndpointClient) ConfigureContainerInterfacesAndRoutes(e
189189
}
190190

191191
func (client *TransparentEndpointClient) DeleteEndpoints(ep *endpoint) error {
192-
log.Printf("[net] Deleting veth pair %v %v.", ep.HostIfName, ep.IfName)
193-
err := netlink.DeleteLink(ep.HostIfName)
194-
if err != nil {
195-
log.Printf("[net] Failed to delete veth pair %v: %v.", ep.HostIfName, err)
196-
return err
197-
}
198-
199192
return nil
200193
}

0 commit comments

Comments
 (0)