Skip to content

Commit 3b0e64a

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> (cherry picked from commit cbc7b61)
1 parent a10c3d4 commit 3b0e64a

File tree

141 files changed

+2868
-13862
lines changed

Some content is hidden

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

141 files changed

+2868
-13862
lines changed

pkg/pillar/go.mod

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ require (
1818
github.com/facebook/time v0.0.0-20240605113323-bdee26e8523f
1919
github.com/fsnotify/fsnotify v1.6.0
2020
github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede
21-
github.com/go-chi/chi/v5 v5.0.10
21+
github.com/go-chi/chi/v5 v5.2.2
2222
github.com/go-playground/validator/v10 v10.15.5
2323
github.com/golang-jwt/jwt v3.2.2+incompatible
2424
github.com/golang/protobuf v1.5.4
25-
github.com/google/go-cmp v0.6.0
25+
github.com/google/go-cmp v0.7.0
2626
github.com/google/go-containerregistry v0.14.0
2727
github.com/google/go-tpm v0.9.1
2828
github.com/google/gopacket v1.1.19
@@ -34,7 +34,7 @@ require (
3434
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.5.0
3535
github.com/lf-edge/edge-containers v0.0.0-20240207093504-5dfda0619b80
3636
github.com/lf-edge/eve-api/go v0.0.0-20250502212418-fc1e3bad8f0f
37-
github.com/lf-edge/eve-libs v0.0.0-20250703175216-eeb17c04d12c
37+
github.com/lf-edge/eve-libs v0.0.0-20250708204318-622ead38398a
3838
github.com/lf-edge/eve-tools/runtimemetrics/go v0.0.0-20250320220227-713ea9d6c6d2
3939
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
4040
github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56
@@ -58,9 +58,9 @@ require (
5858
github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
5959
github.com/vishvananda/netlink v1.3.1
6060
go.uber.org/goleak v1.3.0
61-
golang.org/x/crypto v0.36.0
62-
golang.org/x/net v0.38.0
63-
golang.org/x/sys v0.31.0
61+
golang.org/x/crypto v0.37.0
62+
golang.org/x/net v0.39.0
63+
golang.org/x/sys v0.33.0
6464
google.golang.org/grpc v1.61.0
6565
google.golang.org/protobuf v1.36.5
6666
gopkg.in/yaml.v2 v2.4.0
@@ -77,8 +77,7 @@ require (
7777

7878
require (
7979
cloud.google.com/go v0.112.0 // indirect
80-
cloud.google.com/go/compute v1.23.4 // indirect
81-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
80+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
8281
cloud.google.com/go/iam v1.1.6 // indirect
8382
cloud.google.com/go/storage v1.36.0 // indirect
8483
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
@@ -134,16 +133,16 @@ require (
134133
github.com/gorilla/mux v1.8.1 // indirect
135134
github.com/jaypipes/pcidb v0.6.0 // indirect
136135
github.com/josharian/intern v1.0.0 // indirect
137-
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531 // indirect
136+
github.com/josharian/native v1.1.0 // indirect
138137
github.com/json-iterator/go v1.1.12 // indirect
139138
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
140139
github.com/klauspost/compress v1.17.6 // indirect
141140
github.com/kr/fs v0.1.0 // indirect
142141
github.com/leodido/go-urn v1.2.4 // indirect
143142
github.com/lithammer/shortuuid/v4 v4.2.0 // indirect
144143
github.com/mailru/easyjson v0.7.7 // indirect
145-
github.com/mdlayher/netlink v1.7.1 // indirect
146-
github.com/mdlayher/socket v0.4.0 // indirect
144+
github.com/mdlayher/netlink v1.7.2 // indirect
145+
github.com/mdlayher/socket v0.5.1 // indirect
147146
github.com/mitchellh/go-homedir v1.1.0 // indirect
148147
github.com/moby/locker v1.0.1 // indirect
149148
github.com/moby/sys/sequential v0.5.0 // indirect
@@ -162,8 +161,8 @@ require (
162161
github.com/prometheus/common v0.46.0 // indirect
163162
github.com/robertkrimen/otto v0.0.0-20221011175642-09fc211e5ab1 // indirect
164163
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
165-
github.com/ti-mo/conntrack v0.4.0 // indirect
166-
github.com/ti-mo/netfilter v0.3.1 // indirect
164+
github.com/ti-mo/conntrack v0.5.3-0.20250707093024-c0d46dc6bcc8 // indirect
165+
github.com/ti-mo/netfilter v0.5.3 // indirect
167166
github.com/tklauser/go-sysconf v0.3.11 // indirect
168167
github.com/tklauser/numcpus v0.6.0 // indirect
169168
github.com/vbatts/tar-split v0.11.2 // indirect
@@ -179,13 +178,12 @@ require (
179178
go.opentelemetry.io/otel/metric v1.23.1 // indirect
180179
go.opentelemetry.io/otel/trace v1.23.1 // indirect
181180
golang.org/x/mod v0.17.0 // indirect
182-
golang.org/x/oauth2 v0.16.0 // indirect
183-
golang.org/x/sync v0.12.0 // indirect
184-
golang.org/x/term v0.30.0 // indirect
185-
golang.org/x/text v0.23.0 // indirect
181+
golang.org/x/oauth2 v0.27.0 // indirect
182+
golang.org/x/sync v0.14.0 // indirect
183+
golang.org/x/term v0.31.0 // indirect
184+
golang.org/x/text v0.24.0 // indirect
186185
golang.org/x/time v0.5.0 // indirect
187186
google.golang.org/api v0.160.0 // indirect
188-
google.golang.org/appengine v1.6.8 // indirect
189187
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
190188
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
191189
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect

pkg/pillar/go.sum

Lines changed: 32 additions & 50 deletions
Large diffs are not rendered by default.

pkg/pillar/vendor/cloud.google.com/go/compute/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

pkg/pillar/vendor/cloud.google.com/go/compute/internal/version.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

pkg/pillar/vendor/cloud.google.com/go/compute/metadata/CHANGES.md

Lines changed: 7 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)