Skip to content

Commit f26127c

Browse files
committed
Update eve-libs
Update eve-libs dependency, which now uses the latest github.com/ti-mo/conntrack library that was patched to properly handle conntrack retrieval for IPv6 entries. This is the PR with the fix: ti-mo/conntrack#46 We use this library inside eve-libs/nettrace to capture information provided by conntrack, such as the number of packets/bytes seen in both directions, state of the connection as observed by conntrack, etc. Signed-off-by: Milan Lenco <milan@zededa.com>
1 parent 43d4287 commit f26127c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1897
-889
lines changed

pkg/pillar/go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/go-playground/validator/v10 v10.15.5
2222
github.com/golang-jwt/jwt v3.2.2+incompatible
2323
github.com/golang/protobuf v1.5.4
24-
github.com/google/go-cmp v0.6.0
24+
github.com/google/go-cmp v0.7.0
2525
github.com/google/go-containerregistry v0.14.0
2626
github.com/google/go-tpm v0.9.1
2727
github.com/google/gopacket v1.1.19
@@ -33,7 +33,7 @@ require (
3333
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.5.0
3434
github.com/lf-edge/edge-containers v0.0.0-20240207093504-5dfda0619b80
3535
github.com/lf-edge/eve-api/go v0.0.0-20250626182814-c725ece2f435
36-
github.com/lf-edge/eve-libs v0.0.0-20250703175216-eeb17c04d12c
36+
github.com/lf-edge/eve-libs v0.0.0-20250708204318-622ead38398a
3737
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
3838
github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56
3939
github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240507172735-6d37353ca1ee
@@ -56,9 +56,9 @@ require (
5656
github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
5757
github.com/vishvananda/netlink v1.3.1
5858
go.uber.org/goleak v1.3.0
59-
golang.org/x/crypto v0.36.0
60-
golang.org/x/net v0.38.0
61-
golang.org/x/sys v0.31.0
59+
golang.org/x/crypto v0.37.0
60+
golang.org/x/net v0.39.0
61+
golang.org/x/sys v0.33.0
6262
google.golang.org/grpc v1.61.0
6363
google.golang.org/protobuf v1.36.6
6464
gopkg.in/yaml.v2 v2.4.0
@@ -132,16 +132,16 @@ require (
132132
github.com/gorilla/mux v1.8.1 // indirect
133133
github.com/jaypipes/pcidb v0.6.0 // indirect
134134
github.com/josharian/intern v1.0.0 // indirect
135-
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531 // indirect
135+
github.com/josharian/native v1.1.0 // indirect
136136
github.com/json-iterator/go v1.1.12 // indirect
137137
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
138138
github.com/klauspost/compress v1.17.6 // indirect
139139
github.com/kr/fs v0.1.0 // indirect
140140
github.com/leodido/go-urn v1.2.4 // indirect
141141
github.com/lithammer/shortuuid/v4 v4.2.0 // indirect
142142
github.com/mailru/easyjson v0.7.7 // indirect
143-
github.com/mdlayher/netlink v1.7.1 // indirect
144-
github.com/mdlayher/socket v0.4.0 // indirect
143+
github.com/mdlayher/netlink v1.7.2 // indirect
144+
github.com/mdlayher/socket v0.5.1 // indirect
145145
github.com/mitchellh/go-homedir v1.1.0 // indirect
146146
github.com/moby/locker v1.0.1 // indirect
147147
github.com/moby/sys/sequential v0.5.0 // indirect
@@ -160,8 +160,8 @@ require (
160160
github.com/prometheus/common v0.46.0 // indirect
161161
github.com/robertkrimen/otto v0.0.0-20221011175642-09fc211e5ab1 // indirect
162162
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
163-
github.com/ti-mo/conntrack v0.4.0 // indirect
164-
github.com/ti-mo/netfilter v0.3.1 // indirect
163+
github.com/ti-mo/conntrack v0.5.3-0.20250707093024-c0d46dc6bcc8 // indirect
164+
github.com/ti-mo/netfilter v0.5.3 // indirect
165165
github.com/tklauser/go-sysconf v0.3.11 // indirect
166166
github.com/tklauser/numcpus v0.6.0 // indirect
167167
github.com/vbatts/tar-split v0.11.2 // indirect
@@ -178,9 +178,9 @@ require (
178178
go.opentelemetry.io/otel/trace v1.23.1 // indirect
179179
golang.org/x/mod v0.17.0 // indirect
180180
golang.org/x/oauth2 v0.16.0 // indirect
181-
golang.org/x/sync v0.12.0 // indirect
182-
golang.org/x/term v0.30.0 // indirect
183-
golang.org/x/text v0.23.0 // indirect
181+
golang.org/x/sync v0.14.0 // indirect
182+
golang.org/x/term v0.31.0 // indirect
183+
golang.org/x/text v0.24.0 // indirect
184184
golang.org/x/time v0.5.0
185185
google.golang.org/api v0.160.0 // indirect
186186
google.golang.org/appengine v1.6.8 // indirect

pkg/pillar/go.sum

Lines changed: 26 additions & 41 deletions
Large diffs are not rendered by default.

pkg/pillar/vendor/github.com/google/go-cmp/cmp/internal/function/func.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/google/go-cmp/cmp/options.go

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/lf-edge/eve-libs/nettrace/conntrack.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/lf-edge/eve-libs/nettrace/httpclient.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/mdlayher/netlink/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/mdlayher/socket/CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)