runtime: vendor: Bump the netlink package dependency

We need to be able to get the IP family from the netlink route meesages,
and the Route.Family field only got recently added to the netlink
package.

The update generates static check warnings about the call for
nethandler.Delete() being deprecated in favor of a Close() call instead.
So we include the s/Delete()/Close()/ change as part of this PR.

Signed-off-by: Samuel Ortiz <s.ortiz@apple.com>
This commit is contained in:
Samuel Ortiz
2021-09-28 17:55:46 +02:00
parent fd5c858390
commit f85fe70231
51 changed files with 2330 additions and 295 deletions

View File

@@ -575,7 +575,7 @@ func tapNetworkPair(ctx context.Context, endpoint Endpoint, queues int, disableV
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
netPair := endpoint.NetworkPair()
@@ -672,7 +672,7 @@ func setupTCFiltering(ctx context.Context, endpoint Endpoint, queues int, disabl
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
netPair := endpoint.NetworkPair()
@@ -847,7 +847,7 @@ func untapNetworkPair(ctx context.Context, endpoint Endpoint) error {
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
netPair := endpoint.NetworkPair()
@@ -891,7 +891,7 @@ func removeTCFiltering(ctx context.Context, endpoint Endpoint) error {
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
netPair := endpoint.NetworkPair()
@@ -1168,7 +1168,7 @@ func createEndpointsFromScan(networkNSPath string, config *NetworkConfig) ([]End
if err != nil {
return []Endpoint{}, err
}
defer netlinkHandle.Delete()
defer netlinkHandle.Close()
linkList, err := netlinkHandle.LinkList()
if err != nil {
@@ -1568,7 +1568,7 @@ func addIFBDevice() (int, error) {
if err != nil {
return -1, err
}
defer netHandle.Delete()
defer netHandle.Close()
// There exists error when using netlink library to create ifb interface
cmd := exec.Command("ip", "link", "add", "dev", "ifb0", "type", "ifb")
@@ -1744,7 +1744,7 @@ func removeTxRateLimiter(endpoint Endpoint, networkNSPath string) error {
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
// remove ifb interface
ifbLink, err := netlink.LinkByName("ifb0")

View File

@@ -188,7 +188,8 @@ func TestCreateGetTunTapLink(t *testing.T) {
assert := assert.New(t)
netHandle, err := netlink.NewHandle()
defer netHandle.Delete()
assert.NoError(err)
defer netHandle.Close()
assert.NoError(err)
@@ -213,7 +214,8 @@ func TestCreateMacVtap(t *testing.T) {
assert := assert.New(t)
netHandle, err := netlink.NewHandle()
defer netHandle.Delete()
assert.NoError(err)
defer netHandle.Close()
assert.NoError(err)
@@ -258,7 +260,7 @@ func TestTcRedirectNetwork(t *testing.T) {
netHandle, err := netlink.NewHandle()
assert.NoError(err)
defer netHandle.Delete()
defer netHandle.Close()
// Create a test veth interface.
vethName := "foo"
@@ -296,7 +298,7 @@ func TestRxRateLimiter(t *testing.T) {
netHandle, err := netlink.NewHandle()
assert.NoError(err)
defer netHandle.Delete()
defer netHandle.Close()
// Create a test veth interface.
vethName := "foo"
@@ -345,7 +347,7 @@ func TestTxRateLimiter(t *testing.T) {
netHandle, err := netlink.NewHandle()
assert.NoError(err)
defer netHandle.Delete()
defer netHandle.Close()
// Create a test veth interface.
vethName := "foo"

View File

@@ -77,7 +77,7 @@ func TestIsPhysicalIface(t *testing.T) {
netlinkHandle, err := netlink.NewHandleAt(netnsHandle)
assert.NoError(err)
defer netlinkHandle.Delete()
defer netlinkHandle.Close()
err = netlinkHandle.LinkAdd(link)
assert.NoError(err)

View File

@@ -156,7 +156,7 @@ func tapNetwork(endpoint *TapEndpoint, numCPUs uint32, disableVhostNet bool) err
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
tapLink, fds, err := createLink(netHandle, endpoint.TapInterface.TAPIface.Name, &netlink.Tuntap{}, int(numCPUs))
if err != nil {
@@ -192,7 +192,7 @@ func unTapNetwork(name string) error {
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
tapLink, err := getLinkByName(netHandle, name, &netlink.Tuntap{})
if err != nil {
return fmt.Errorf("Could not get TAP interface: %s", err)

View File

@@ -173,7 +173,7 @@ func tuntapNetwork(endpoint *TuntapEndpoint, numCPUs uint32, disableVhostNet boo
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
tapLink, _, err := createLink(netHandle, endpoint.TuntapInterface.TAPIface.Name, &netlink.Tuntap{}, int(numCPUs))
if err != nil {
@@ -201,7 +201,7 @@ func unTuntapNetwork(name string) error {
if err != nil {
return err
}
defer netHandle.Delete()
defer netHandle.Close()
tapLink, err := getLinkByName(netHandle, name, &netlink.Tuntap{})
if err != nil {
return fmt.Errorf("Could not get TAP interface: %s", err)