[v0.13.0-beta1-m.1] Bump github.com/containerd/containerd to v1.7.33#11
Merged
corhere merged 2 commits intoJul 10, 2026
Merged
Conversation
containerd v1.7.28 renamed the ExpiresIn field of the token responses in remotes/docker/auth to ExpiresInSeconds (same type and JSON tag); adapt authprovider and resolver/authorizer accordingly. The ExpiresIn uses of buildkit's own session/auth protobuf type are unchanged. The bump also upgrades transitive dependencies, notably: - go.opentelemetry.io/otel v1.14.0 -> v1.21.0 (otelgrpc v0.46.1) - google.golang.org/grpc v1.53.0 -> v1.59.0 - google.golang.org/protobuf v1.30.0 -> v1.35.2 - golang.org/x/crypto v0.14.0 -> v0.45.0 and other golang.org/x bumps Adapt to APIs deprecated by the bump (staticcheck SA1019): - switch to the extracted github.com/containerd/platforms and github.com/moby/sys/userns modules - trace.NewNoopTracerProvider -> noop.NewTracerProvider - reference.SplitObject -> reference.Spec.Digest (equivalent behavior) - runtime/v2/runc/options -> api/types/runc/options import path - suppress SA1019 for the deprecated otelgrpc interceptors; migrating to the stats.Handler replacement API is too invasive for this branch Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
Regenerate util/stack/stack.pb.go with protoc-gen-go v1.35.2, following the google.golang.org/protobuf bump. Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
corhere
approved these changes
Jul 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps containerd to v1.7.33 for the MCR 25 CVE work, together with the transitive upgrades it forces (otel v1.14.0 -> v1.21.0, grpc v1.53.0 -> v1.59.0, protobuf v1.35.2, golang.org/x/*). Without this change, buildx fails to compile against containerd >= v1.7.28.
Two kinds of source adaptations were needed:
Compile fix: containerd v1.7.28 renamed
ExpiresIn->ExpiresInSeconds(same type and JSON tag) in theremotes/docker/authtoken responses; adaptedsession/auth/authproviderandutil/resolver/authorizer. TheExpiresInfield of buildkit's own session/auth protobuf is a different type and is unchanged.Lint fixes (staticcheck SA1019): the bump deprecates several APIs; adapted to the replacements where they are drop-in:
github.com/containerd/platformsandgithub.com/moby/sys/usernsmodules (import swaps)trace.NewNoopTracerProvider->noop.NewTracerProviderreference.SplitObject->reference.Spec.Digest(equivalent behavior)runtime/v2/runc/options->api/types/runc/optionsimport path//nolint:staticcheck; migrating to thestats.Handlerreplacement API is too invasive for this branch.Also regenerates util/stack/stack.pb.go (
protoc-gen-go v1.35.2) to satisfy validate-generated-files.Verified end-to-end from buildx with a local replace: build, lint, and the integration test subset.