Skip to content

Commit 6941b07

Browse files
authored
netlink package upgrade related changes
1 parent c5234c7 commit 6941b07

File tree

3 files changed

+33
-12
lines changed

3 files changed

+33
-12
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ require (
4646
github.com/spf13/afero v1.11.0
4747
github.com/spf13/cobra v1.8.1
4848
github.com/stretchr/testify v1.9.0
49-
github.com/vishvananda/netlink v1.1.0
49+
github.com/vishvananda/netlink v1.3.0
5050
github.com/zcalusic/sysinfo v1.1.2
5151
go.uber.org/mock v0.4.0
5252
go.uber.org/multierr v1.11.0 // github.com/uber-go/multierr
5353
golang.org/x/crypto v0.28.0 // github.com/golang/crypto
5454
golang.org/x/net v0.30.0 // github.com/golang/net
5555
golang.org/x/oauth2 v0.23.0 // github.com/golang/oauth2
56-
golang.org/x/sys v0.26.0 // github.com/golang/sys
56+
golang.org/x/sys v0.29.0 // github.com/golang/sys
5757
golang.org/x/text v0.19.0 // github.com/golang/text
5858
golang.org/x/time v0.7.0 // github.com/golang/time
5959
google.golang.org/api v0.200.0
@@ -159,7 +159,7 @@ require (
159159
github.com/rivo/uniseg v0.1.0 // indirect
160160
github.com/spf13/pflag v1.0.5 // indirect
161161
github.com/stretchr/objx v0.5.2 // indirect
162-
github.com/vishvananda/netns v0.0.4 // indirect
162+
github.com/vishvananda/netns v0.0.5 // indirect
163163
github.com/x448/float16 v0.8.4 // indirect
164164
go.mongodb.org/mongo-driver v1.14.0 // indirect
165165
go.opencensus.io v0.24.0 // indirect

go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
352352
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
353353
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
354354
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
355-
github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
356-
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
357-
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
358-
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
355+
github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
356+
github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
359357
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
358+
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
359+
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
360360
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
361361
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
362362
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -425,14 +425,15 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
425425
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
426426
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
427427
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
428-
golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
429428
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
430429
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
431430
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
432431
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
433432
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
434-
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
435-
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
433+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
434+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
435+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
436+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
436437
golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
437438
golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
438439
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

utils/osutils/osutils_linux.go

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,32 @@ func (o *OSUtils) getIPAddressesExceptingNondefaultRoutes(ctx context.Context) (
157157
Logc(ctx).Debug(">>>> osutils_linux.getAddressesExceptingNondefaultRoutes")
158158
defer Logc(ctx).Debug("<<<< osutils_linux.getAddressesExceptingNondefaultRoutes")
159159

160-
// Get all default routes (nil destination)
161-
routes, err := netLink.RouteListFiltered(netlink.FAMILY_ALL, &netlink.Route{}, netlink.RT_FILTER_DST)
160+
// Get all default routes
161+
var routes []netlink.Route
162+
163+
getRoutesByDestination := func(family int, dst *net.IPNet) ([]netlink.Route, error) {
164+
return netLink.RouteListFiltered(family, &netlink.Route{Dst: dst}, netlink.RT_FILTER_DST)
165+
}
166+
167+
ipv4Routes, err := getRoutesByDestination(netlink.FAMILY_ALL, &net.IPNet{
168+
IP: net.IPv4zero,
169+
Mask: net.CIDRMask(0, 32),
170+
})
171+
if err != nil {
172+
Logc(ctx).Error(err)
173+
return nil, err
174+
}
175+
routes = append(routes, ipv4Routes...)
176+
177+
ipv6Routes, err := getRoutesByDestination(netlink.FAMILY_ALL, &net.IPNet{
178+
IP: net.IPv6zero,
179+
Mask: net.CIDRMask(0, 128),
180+
})
162181
if err != nil {
163182
Logc(ctx).Error(err)
164183
return nil, err
165184
}
185+
routes = append(routes, ipv6Routes...)
166186

167187
// Get deduplicated set of links associated with default routes
168188
intfIndexMap := make(map[int]struct{})

0 commit comments

Comments
 (0)