Skip to content

vendor assorted dependencies in preparation of BuildKit v0.17#48613

Merged
thaJeztah merged 10 commits intomoby:masterfrom
thaJeztah:bump_buildkit_deps
Oct 10, 2024
Merged

vendor assorted dependencies in preparation of BuildKit v0.17#48613
thaJeztah merged 10 commits intomoby:masterfrom
thaJeztah:bump_buildkit_deps

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Oct 9, 2024

vendor: go.etcd.io/bbolt v1.3.11

BoltDB

  • Fix the freelist.allocs isn't rollbacked when a tx is rollbacked.

CMD

  • Add -gobench-output option for bench command to adapt to benchstat.

Other

full diff: etcd-io/bbolt@v1.3.10...v1.3.11

vendor: golang.org/x/sys v0.25.0

full diff: golang/sys@v0.24.0...v0.25.0

vendor: golang.org/x/text v0.18.0

no changes in vendored code

full diff: golang/text@v0.17.0...v0.18.0

vendor: golang.org/x/crypto v0.27.0

full diff: golang/crypto@v0.26.0...v0.27.0

vendor: golang.org/x/net v0.29.0

no changes in vendored code

full diff: golang/net@v0.28.0...v0.29.0

vendor: golang.org/x/mod v0.21.0

full diff: golang/mod@v0.20.0...v0.21.0

vendor: golang.org/x/tools v0.25.0

full diff: golang/tools@v0.24.0...v0.25.0

vendor: github.com/cespare/xxhash/v2 v2.3.0

full diff: cespare/xxhash@v2.2.0...v2.3.0

vendor: google.golang.org/protobuf v1.34.1

full diff: protocolbuffers/protobuf-go@v1.33.0...v1.34.1

vendor: google.golang.org/grpc v1.66.2

@thaJeztah
Copy link
Copy Markdown
Member Author

one linting failure that needs fixing;

INFO [runner] linters took 55.636062526s with stages: goanalysis_metalinter: 55.521510806s 
daemon/daemon.go:993:3: SA1019: grpc.WithBlock is deprecated: this DialOption is not supported by NewClient. Will be supported throughout 1.x. (staticcheck)
		grpc.WithBlock(),
		^

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Oct 9, 2024

one linting failure that needs fixing;

INFO [runner] linters took 55.636062526s with stages: goanalysis_metalinter: 55.521510806s 
daemon/daemon.go:993:3: SA1019: grpc.WithBlock is deprecated: this DialOption is not supported by NewClient. Will be supported throughout 1.x. (staticcheck)
		grpc.WithBlock(),
		^

Looks like we could take a similar approach as is taken in containerd;

@thaJeztah
Copy link
Copy Markdown
Member Author

Looks like we could take a similar approach as is taken in containerd;

Oh, LOL, but the containerd client version we vendor still uses the old code. The odd bit here is that we're passing those deprecated options to containerd, but it also has it in containerd itself (as default?)

BoltDB

- Fix the freelist.allocs isn't rollbacked when a tx is rollbacked.

CMD

- Add -gobench-output option for bench command to adapt to benchstat.

Other

- Bump go version to 1.22.x.
- This patch also added dmflakey package, which can be reused by other projects. See moby#812.

full diff: etcd-io/bbolt@v1.3.10...v1.3.11

Signed-off-by: Sebastiaan van Stijn <[email protected]>
no changes in vendored code

full diff: golang/text@v0.17.0...v0.18.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
no changes in vendored code

full diff: golang/net@v0.28.0...v0.29.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah requested a review from tianon as a code owner October 10, 2024 00:39
Comment thread daemon/daemon.go
Comment on lines +994 to +995
// TODO(thaJeztah): update this list once https://github.com/containerd/containerd/pull/10250/commits/63b46881753588624b2eac986660458318581330 is in the 1.7 release.
grpc.WithBlock(), //nolint:staticcheck // Ignore SA1019: grpc.WithBlock is deprecated: this DialOption is not supported by NewClient. Will be supported throughout 1.x.
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went for suppressing the deprecation for now, because it's supported throughout 1.x, and we probably want to switch over once containerd 1.7 client has the linked patches.

I also opened a separate PR to align our options more with containerd's defaults, because it looks like we diverged;

@thaJeztah thaJeztah merged commit eacb99d into moby:master Oct 10, 2024
@thaJeztah thaJeztah deleted the bump_buildkit_deps branch October 10, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants