Skip to content

Commit 0967fd2

Browse files
eriknordmarkeriknordmark
committed
[DO NOT MERGE] test eden in 16.0-stable
This PR has changes from make bump_eve_pillar so we can test the new eden setup Signed-off-by: eriknordmark <erik@zededa.com>
1 parent a51866c commit 0967fd2

Some content is hidden

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

71 files changed

+33305
-137
lines changed

‎pkg/debug/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# has a fast path for stack unwinding. This also happens
99
# to be a perfect place to put any other kind of debug info
1010
# into the package: see abuild/etc/abuild.conf.
11-
FROM lfedge/eve-recovertpm:d49430da0350750b08515049eeca9a47a8e0f424 AS recovertpm
11+
FROM lfedge/eve-recovertpm:fa8b539edefb3229232f9487be827fb14874e1c0 AS recovertpm
1212
FROM lfedge/eve-bpftrace:c08d714db34b7cde90d20c56e74d2c11afe483df AS bpftrace
1313
FROM lfedge/eve-alpine:745ae9066273c73b0fd879c4ba4ff626a8392d04 AS build
1414
ENV BUILD_PKGS="abuild curl tar make linux-headers patch g++ git gcc gpg ncurses-dev autoconf openssl-dev zlib-dev jq pciutils usbutils lsblk"

‎pkg/edgeview/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/gorilla/websocket v1.5.0
1111
github.com/grandcat/zeroconf v1.0.0
1212
github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235
13-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573
13+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257
1414
github.com/onsi/gomega v1.35.1
1515
github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76
1616
github.com/shirou/gopsutil v3.21.11+incompatible

‎pkg/edgeview/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235 h1:JxQJV1LggYU6
6464
github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235/go.mod h1:6HxNA/qKJVEqwpuOFkcQ0h3QyotvAs/cjHLC961FPOY=
6565
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d h1:tUBb9M6u42LXwHAYHyh22wJeUUQlTpDkXwRXalpRqbo=
6666
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d/go.mod h1:Nn3juMJJ1G8dyHOebdZyS4jOB/fuxAd5fIajBaWjHr8=
67-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573 h1:TT+cI/xvQ3XzxQSIX4cN5eq1Lq7d8p2rO1CxVXnWqPI=
68-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573/go.mod h1:IFLV+htdvT3dCMLYz4vN3kOUBVKFr6PIy7r7yeubyYQ=
67+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257 h1:dlkj+6AN3AEvHA9KO891BKHoRgazQXb0EF2F4nzkeCg=
68+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257/go.mod h1:K2hwlF6pGguhVpTs+9KOWEKnuQQO0dJOxHopUE3LNHM=
6969
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
7070
github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
7171
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=

‎pkg/edgeview/vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ github.com/lf-edge/eve-api/go/profile
8989
# github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
9090
## explicit; go 1.20
9191
github.com/lf-edge/eve/pkg/kube/cnirpc
92-
# github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573
92+
# github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257
9393
## explicit; go 1.24.0
9494
github.com/lf-edge/eve/pkg/pillar/base
9595
github.com/lf-edge/eve/pkg/pillar/evetpm

‎pkg/installer/src/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
require (
66
github.com/google/go-tpm v0.9.1
7-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573
7+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257
88
github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76
99
github.com/sirupsen/logrus v1.9.3
1010
)

‎pkg/installer/src/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235 h1:JxQJV1LggYU6
4949
github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235/go.mod h1:6HxNA/qKJVEqwpuOFkcQ0h3QyotvAs/cjHLC961FPOY=
5050
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d h1:tUBb9M6u42LXwHAYHyh22wJeUUQlTpDkXwRXalpRqbo=
5151
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d/go.mod h1:Nn3juMJJ1G8dyHOebdZyS4jOB/fuxAd5fIajBaWjHr8=
52-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573 h1:TT+cI/xvQ3XzxQSIX4cN5eq1Lq7d8p2rO1CxVXnWqPI=
53-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573/go.mod h1:IFLV+htdvT3dCMLYz4vN3kOUBVKFr6PIy7r7yeubyYQ=
52+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257 h1:dlkj+6AN3AEvHA9KO891BKHoRgazQXb0EF2F4nzkeCg=
53+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257/go.mod h1:K2hwlF6pGguhVpTs+9KOWEKnuQQO0dJOxHopUE3LNHM=
5454
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
5656
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎pkg/installer/src/vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ github.com/lf-edge/eve-api/go/profile
6969
# github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
7070
## explicit; go 1.20
7171
github.com/lf-edge/eve/pkg/kube/cnirpc
72-
# github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573
72+
# github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257
7373
## explicit; go 1.24.0
7474
github.com/lf-edge/eve/pkg/pillar/base
7575
github.com/lf-edge/eve/pkg/pillar/evetpm

‎pkg/newlog/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/golang/protobuf v1.5.4
88
github.com/google/go-cmp v0.7.0
99
github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235
10-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573
10+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257
1111
github.com/onsi/gomega v1.35.1
1212
github.com/sirupsen/logrus v1.9.3
1313
)
@@ -95,9 +95,9 @@ require (
9595
go.opencensus.io v0.24.0 // indirect
9696
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
9797
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
98-
go.opentelemetry.io/otel v1.39.0 // indirect
99-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
100-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
98+
go.opentelemetry.io/otel v1.40.0 // indirect
99+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
100+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
101101
golang.org/x/crypto v0.46.0 // indirect
102102
golang.org/x/mod v0.30.0 // indirect
103103
golang.org/x/net v0.48.0 // indirect

‎pkg/newlog/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235 h1:JxQJV1LggYU6
201201
github.com/lf-edge/eve-api/go v0.0.0-20260116205402-bac92fb1f235/go.mod h1:6HxNA/qKJVEqwpuOFkcQ0h3QyotvAs/cjHLC961FPOY=
202202
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d h1:tUBb9M6u42LXwHAYHyh22wJeUUQlTpDkXwRXalpRqbo=
203203
github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d/go.mod h1:Nn3juMJJ1G8dyHOebdZyS4jOB/fuxAd5fIajBaWjHr8=
204-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573 h1:TT+cI/xvQ3XzxQSIX4cN5eq1Lq7d8p2rO1CxVXnWqPI=
205-
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260325052340-21987cccd573/go.mod h1:IFLV+htdvT3dCMLYz4vN3kOUBVKFr6PIy7r7yeubyYQ=
204+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257 h1:dlkj+6AN3AEvHA9KO891BKHoRgazQXb0EF2F4nzkeCg=
205+
github.com/lf-edge/eve/pkg/pillar v0.0.0-20260402133217-2a5ed86d6257/go.mod h1:K2hwlF6pGguhVpTs+9KOWEKnuQQO0dJOxHopUE3LNHM=
206206
github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240507172735-6d37353ca1ee h1:ASS39H/5OkVqkGSOR2xtcIsu3EZH4aDQOKhE1OfazUo=
207207
github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240507172735-6d37353ca1ee/go.mod h1:UMA/+cd1QZElFCZAhuGv0TEEdWP9AgcRSXSI6S+r/KA=
208208
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -336,16 +336,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
336336
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
337337
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
338338
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
339-
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
340-
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
341-
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
342-
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
343-
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
344-
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
345-
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
346-
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
347-
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
348-
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
339+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
340+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
341+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
342+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
343+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
344+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
345+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
346+
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
347+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
348+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
349349
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
350350
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
351351
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎pkg/newlog/vendor/go.opentelemetry.io/otel/.golangci.yml‎

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