Skip to content

Bump up containerd to v2.3.2 #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ktock wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Bump up containerd to v2.3.2 #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb82aff
go.mod: containerd v2.3.1
ktock May 26, 2026
38032cb
Dockerfile: containerd v2.3.1
ktock May 26, 2026
feaa4f7
Fix linter errors
ktock May 26, 2026
aaea327
go.mod: bump up containerd to v2.3.2
ktock Jul 1, 2026
35289c9
Dockerfile: bump up containerd to 2.3.2
ktock Jul 1, 2026
0c292b7
CI: fix k3s local image target
ktock Jul 1, 2026
98f5d07
go.mod: Bump up containerd to 2.3.3
ktock Jul 29, 2026
7dc4254
Dockerfile: bump up containerd to 2.3.3
ktock Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG CONTAINERD_VERSION=v2.2.3
ARG CONTAINERD_VERSION=v2.3.3
ARG RUNC_VERSION=v1.4.2
ARG CNI_PLUGINS_VERSION=v1.9.1
ARG NERDCTL_VERSION=2.2.2
Expand Down
4 changes: 2 additions & 2 deletions cmd/containerd-stargz-grpc/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,15 +444,15 @@ func writeMetadataEntry(md *bolt.Bucket, m *metadataEntry) error {
}
}
if err := cbkt.Put([]byte(c.base), encodeID(c.id)); err != nil {
return fmt.Errorf("failed to add child ID %q: %w", c.id, err)
return fmt.Errorf("failed to add child ID %d: %w", c.id, err)
}
}
}
}
if len(m.chunks) > 0 {
first := m.chunks[0]
if err := md.Put(bucketKeyChunk, encodeChunkEntry(first)); err != nil {
return fmt.Errorf("failed to set chunk %q: %w", first.offset, err)
return fmt.Errorf("failed to set chunk %d: %w", first.offset, err)
}
var cbkt *bolt.Bucket
for _, e := range m.chunks[1:] {
Expand Down
4 changes: 2 additions & 2 deletions cmd/containerd-stargz-grpc/db/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ func (r *reader) openFile(id uint32, preRead func(id uint32, chunkOffset, chunkS
size, _ = binary.Varint(b.Get(bucketKeySize))
m, _ := binary.Uvarint(b.Get(bucketKeyMode))
if !os.FileMode(uint32(m)).IsRegular() {
return fmt.Errorf("%q is not a regular file", id)
return fmt.Errorf("%d is not a regular file", id)
}

metadataEntries, err := getMetadata(tx, r.fsID)
Expand Down Expand Up @@ -1022,7 +1022,7 @@ func getIDByName(md map[uint32]*metadataEntry, name string, rootID uint32) (uint
return 0, fmt.Errorf("not found metadata of %d", pid)
}
if md[pid].children == nil {
return 0, fmt.Errorf("not found children of %q", pid)
return 0, fmt.Errorf("not found children of %d", pid)
}
c, ok := md[pid].children[base]
if !ok {
Expand Down
70 changes: 33 additions & 37 deletions cmd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/containerd/stargz-snapshotter/cmd

go 1.25.0
go 1.26.3

require (
github.com/bmatcuk/doublestar/v4 v4.10.0
github.com/containerd/containerd/api v1.10.0
github.com/containerd/containerd/v2 v2.2.3
github.com/containerd/containerd/api v1.11.1
github.com/containerd/containerd/v2 v2.3.3
github.com/containerd/go-cni v1.1.13
github.com/containerd/log v0.1.0
github.com/containerd/platforms v1.0.0-rc.4
Expand All @@ -23,33 +23,31 @@ require (
github.com/rs/xid v1.6.0
github.com/urfave/cli/v2 v2.27.7
go.etcd.io/bbolt v1.4.3
golang.org/x/sync v0.20.0
golang.org/x/sys v0.45.0
golang.org/x/sync v0.21.0
golang.org/x/sys v0.46.0
google.golang.org/grpc v1.81.1
tags.cncf.io/container-device-interface v1.1.0
)

require (
cyphar.com/go-pathrs v0.2.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.14.1 // indirect
github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 // indirect
github.com/Microsoft/hcsshim v0.15.0-rc.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cilium/ebpf v0.16.0 // indirect
github.com/containerd/cgroups/v3 v3.1.2 // indirect
github.com/containerd/cgroups/v3 v3.1.3 // indirect
github.com/containerd/console v1.0.5 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/continuity v0.5.0 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/go-runc v1.1.0 // indirect
github.com/containerd/plugin v1.0.0 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/plugin v1.1.0 // indirect
github.com/containerd/ttrpc v1.2.8 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/containernetworking/cni v1.3.0 // indirect
github.com/containernetworking/plugins v1.9.0 // indirect
github.com/containernetworking/plugins v1.9.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v29.4.3+incompatible // indirect
Expand All @@ -68,12 +66,11 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hanwen/go-fuse/v2 v2.10.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/intel/goresctrl v0.10.0 // indirect
github.com/intel/goresctrl v0.12.0 // indirect
github.com/ipfs/go-cid v0.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -102,15 +99,14 @@ require (
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 // indirect
github.com/opencontainers/selinux v1.13.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pelletier/go-toml/v2 v2.3.0 // indirect
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
Expand All @@ -121,36 +117,36 @@ require (
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/crypto v0.53.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/mod v0.32.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/mod v0.36.0 // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/protobuf v1.36.11 // indirect
golang.org/x/term v0.44.0 // indirect
golang.org/x/text v0.38.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.35.3 // indirect
k8s.io/apimachinery v0.35.3 // indirect
k8s.io/client-go v0.35.3 // indirect
k8s.io/cri-api v0.35.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
k8s.io/api v0.36.0 // indirect
k8s.io/apimachinery v0.36.0 // indirect
k8s.io/client-go v0.36.0 // indirect
k8s.io/cri-api v0.36.0 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
)
Expand Down
Loading
Loading