Skip to content

Commit 4787c91

Browse files
zolugzolug
committed
Update NSM API/SDK to use new scope selector
Use network service based scope selector limiting the scope of the cluster connection monitor functionality in stateless-lb. Thus, only NSM connection events that are associated with TAPA->Proxy conns are forwarded to stateless-lb in order to update its linux neighbor cache. Go version had to be updated to 1.23 because of NSM.
1 parent 6a087e3 commit 4787c91

File tree

14 files changed

+53
-40
lines changed

14 files changed

+53
-40
lines changed

‎build/frontend/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10001
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77

88
ENV GO111MODULE=on
99
ENV CGO_ENABLED=0

‎build/ipam/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10004
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77

88
ENV GO111MODULE=on
99
ARG meridio_version=0.0.0-unknown

‎build/nsp/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10003
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎build/operator/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10005
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77
ARG LDFLAGS
88

99
WORKDIR /workspace

‎build/proxy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10005
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎build/stateless-lb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10002
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77
ARG meridio_version=0.0.0-unknown
88
ENV GO111MODULE=on
99

‎build/tapa/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=tapa
33
ARG UID=10005
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.22 as build
6+
FROM golang:1.23 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎cmd/stateless-lb/main.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
lbAPI "github.com/nordix/meridio/api/loadbalancer/v1"
4848
nspAPI "github.com/nordix/meridio/api/nsp/v1"
4949
"github.com/nordix/meridio/cmd/stateless-lb/internal/neighborcache"
50+
conduitns "github.com/nordix/meridio/pkg/conduit"
5051
"github.com/nordix/meridio/pkg/debug"
5152
"github.com/nordix/meridio/pkg/endpoint"
5253
"github.com/nordix/meridio/pkg/health"
@@ -964,7 +965,18 @@ func startClusterConnectionMonitor(
964965
registry.NewNetworkServiceEndpointRegistryClient(cc),
965966
// Use provided gRPC dial options to connect NSMgrs
966967
dialOptions,
967-
&networkservice.MonitorScopeSelector{},
968+
// Monitor only connections matching the specified network service name
969+
// Note: A server running an old API version will simply ignore the unknown
970+
// field in the selector, resulting in a wildcard match.
971+
&networkservice.MonitorScopeSelector{
972+
NetworkServices: []string{
973+
conduitns.GetNetworkServiceNameWithProxy(
974+
config.ConduitName,
975+
config.TrenchName,
976+
config.Namespace,
977+
),
978+
},
979+
},
968980
// Replace "local" URLs with the local NSMgr's URL to avoid connecting the local forwarder
969981
func(connectTo *url.URL) *url.URL {
970982
if strings.HasPrefix(connectTo.String(), "inode://") {

‎examples/target/build/example-target/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG USER=tapa-user
22
ARG UID=10006
33
ARG HOME=/home/${USER}
44

5-
FROM golang:1.22 as build
5+
FROM golang:1.23 as build
66

77
ENV GO111MODULE=on
88

‎examples/target/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/nordix/meridio/examples/target
22

3-
go 1.22
3+
go 1.23
44

5-
toolchain go1.22.0
5+
toolchain go1.23.0
66

77
require (
88
github.com/nordix/meridio v0.8.0

‎go.mod

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/nordix/meridio
22

3-
go 1.22
3+
go 1.23
4+
5+
toolchain go1.23.0
46

57
require (
68
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29
@@ -11,9 +13,9 @@ require (
1113
github.com/golang/mock v1.6.0
1214
github.com/google/nftables v0.2.0
1315
github.com/kelseyhightower/envconfig v1.4.0
14-
github.com/networkservicemesh/api v1.13.2
15-
github.com/networkservicemesh/sdk v1.13.2
16-
github.com/networkservicemesh/sdk-sriov v1.13.2
16+
github.com/networkservicemesh/api v1.14.2
17+
github.com/networkservicemesh/sdk v1.14.2
18+
github.com/networkservicemesh/sdk-sriov v1.14.2
1719
github.com/onsi/ginkgo v1.16.5
1820
github.com/onsi/ginkgo/v2 v2.14.0
1921
github.com/onsi/gomega v1.30.0
@@ -23,13 +25,13 @@ require (
2325
github.com/sirupsen/logrus v1.9.0
2426
github.com/spiffe/go-spiffe/v2 v2.1.7
2527
github.com/stretchr/testify v1.9.0
26-
github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b
28+
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350
2729
go.opentelemetry.io/otel v1.20.0
2830
go.opentelemetry.io/otel/exporters/prometheus v0.43.0
2931
go.opentelemetry.io/otel/metric v1.20.0
3032
go.opentelemetry.io/otel/sdk v1.20.0
3133
go.opentelemetry.io/otel/sdk/metric v1.20.0
32-
go.uber.org/goleak v1.3.0
34+
go.uber.org/goleak v1.3.1-0.20241121203838-4ff5fa6529ee
3335
go.uber.org/zap v1.26.0
3436
golang.org/x/net v0.24.0
3537
golang.org/x/sys v0.19.0
@@ -70,7 +72,7 @@ require (
7072
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7173
github.com/gobwas/glob v0.2.3 // indirect
7274
github.com/gogo/protobuf v1.3.2 // indirect
73-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
75+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
7476
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7577
github.com/golang/protobuf v1.5.4 // indirect
7678
github.com/google/gnostic-models v0.6.8 // indirect
@@ -111,7 +113,7 @@ require (
111113
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
112114
github.com/tklauser/go-sysconf v0.3.13 // indirect
113115
github.com/tklauser/numcpus v0.7.0 // indirect
114-
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
116+
github.com/vishvananda/netns v0.0.4 // indirect
115117
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
116118
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
117119
github.com/yashtewari/glob-intersection v0.1.0 // indirect

‎go.sum

+18-19
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
108108
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
109109
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
110110
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
111-
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
112-
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
111+
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
112+
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
113113
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
114114
github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
115115
github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
@@ -178,8 +178,8 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
178178
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
179179
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
180180
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
181-
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
182-
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
181+
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
182+
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
183183
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
184184
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
185185
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -213,12 +213,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
213213
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
214214
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
215215
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
216-
github.com/networkservicemesh/api v1.13.2 h1:HiQTPED7l2rvGZUFN2FklOh6RGXS6Ha/xZPc8DKLZmQ=
217-
github.com/networkservicemesh/api v1.13.2/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI=
218-
github.com/networkservicemesh/sdk v1.13.2 h1:lvyfy9NSZdSLiaOM9Ic0CLcZLiLhahs67HJDOw8QfO8=
219-
github.com/networkservicemesh/sdk v1.13.2/go.mod h1:Zij694LKc/YFsmo2cw0XI20NIN/RIuWit+hvr8CLIkM=
220-
github.com/networkservicemesh/sdk-sriov v1.13.2 h1:B+v5GUIJmK0hdC6k5mHGEy1FvOTORls/Pm1JNL23KBw=
221-
github.com/networkservicemesh/sdk-sriov v1.13.2/go.mod h1:Y78htZPdQ0X2JJ1XjpqlyryVEmbaG1ER5FYwtg7WSgc=
216+
github.com/networkservicemesh/api v1.14.2 h1:xWLHd/+Q1EZpB39U8bNjlssPJVokiDSp5Sob1YCGvMQ=
217+
github.com/networkservicemesh/api v1.14.2/go.mod h1:GT0Yw1LYFSTxlDyJjBDhIxT82rJ2czZ0TiyzxSyKzvg=
218+
github.com/networkservicemesh/sdk v1.14.2 h1:gJ7uIZRXIyi69OCnWLdGGrXIMVYTzpBWvo3fagPpC0o=
219+
github.com/networkservicemesh/sdk v1.14.2/go.mod h1:dquHV0HvPP2WsDpyRNTIfCMITboO4LhPcy6Ne29t7Og=
220+
github.com/networkservicemesh/sdk-sriov v1.14.2 h1:z167lP+xHbn/vSd3HQg668vlXd1XJr3uYYqjAszdgYo=
221+
github.com/networkservicemesh/sdk-sriov v1.14.2/go.mod h1:PS5wa0P8MwyxxKJoeFXp4Rot+0PszUW44auF6QtN5hM=
222222
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
223223
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
224224
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -290,11 +290,10 @@ github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5I
290290
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
291291
github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
292292
github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
293-
github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b h1:CyMWBGvc1ZOvUBxW51DVTSIIAeJWWJJs+Ko3ouM/AVI=
294-
github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
295-
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
296-
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
297-
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
293+
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350 h1:w5OI+kArIBVksl8UGn6ARQshtPCQvDsbuA9NQie3GIg=
294+
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
295+
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
296+
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
298297
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
299298
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
300299
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -336,8 +335,8 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
336335
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
337336
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
338337
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
339-
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
340-
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
338+
go.uber.org/goleak v1.3.1-0.20241121203838-4ff5fa6529ee h1:uOMbcH1Dmxv45VkkpZQYoerZFeDncWpjbN7ATiQOO7c=
339+
go.uber.org/goleak v1.3.1-0.20241121203838-4ff5fa6529ee/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
341340
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
342341
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
343342
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -402,9 +401,7 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
402401
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
403402
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
404403
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
405-
golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
406404
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
407-
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
408405
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
409406
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
410407
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -415,8 +412,10 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
415412
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
416413
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
417414
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
415+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
418416
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
419417
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
418+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
420419
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
421420
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
422421
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

‎pkg/debug/collect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func listRules() []*Rule {
190190
rules = append(rules, &Rule{
191191
Table: r.Table,
192192
Priority: r.Priority,
193-
Mark: r.Mark,
193+
Mark: int(r.Mark),
194194
Source: source,
195195
Destination: destination,
196196
})

‎pkg/kernel/fwmark.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (fwmr *FWMarkRoute) configure() error {
116116

117117
rule := netlink.NewRule()
118118
rule.Table = fwmr.tableID
119-
rule.Mark = fwmr.fwmark
119+
rule.Mark = uint32(fwmr.fwmark)
120120
rule.Family = fwmr.family()
121121
err := netlink.RuleAdd(rule)
122122
if err != nil {

0 commit comments

Comments
 (0)