Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5811 commits
Select commit Hold shift + click to select a range
7d7c563
add unit tests
HirazawaUi Dec 21, 2025
339b0cc
add integration test
HirazawaUi Feb 26, 2026
6667c76
Merge pull request #12518 from HirazawaUi/support-hostnetwork-userns
AkihiroSuda Mar 30, 2026
b7a467e
Merge pull request #12175 from smira/fix/hide-go-cmp
samuelkarp Mar 30, 2026
6ebe1ce
Merge pull request #13138 from dims/fix-usage-nanocores-window
dims Mar 30, 2026
0ffd99a
build(deps): bump azure/CLI from 2.2.0 to 3.0.0
dependabot[bot] Mar 30, 2026
1be404a
build(deps): bump github/codeql-action from 4.33.0 to 4.35.1
dependabot[bot] Mar 30, 2026
44f01d4
build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.4 to 2.3.0
dependabot[bot] Mar 30, 2026
b6d00e8
Merge pull request #13106 from containerd/dependabot/github_actions/a…
mxpv Mar 31, 2026
9f62f84
Update crun version to 1.27 and enable in mount options test
chrishenzie Mar 31, 2026
98c66b0
Merge pull request #13105 from containerd/dependabot/github_actions/a…
AkihiroSuda Mar 31, 2026
50f5461
Add dmverity support to the erofs snapshotter using veritysetup-go
aadhar-agarwal May 19, 2025
0130ae9
Bump Go to 1.26.0
SergeyKanzhelev Mar 22, 2026
ae04fbd
Merge pull request #13140 from containerd/dependabot/github_actions/a…
mxpv Mar 31, 2026
43d906b
Merge pull request #13117 from HASidd/log-trace
mxpv Mar 31, 2026
d2b31e9
Merge pull request #13134 from thaJeztah/denoise
mxpv Mar 31, 2026
ac77420
Merge pull request #13144 from chrishenzie/update-crun-1.27
mxpv Mar 31, 2026
40249d1
Merge pull request #13090 from SergeyKanzhelev/go126
samuelkarp Mar 31, 2026
c3381c2
Merge pull request #12502 from aadhar-agarwal/aadagarwal/integrate-wi…
AkihiroSuda Apr 1, 2026
f7a6bdf
Merge pull request #12964 from containerd/dependabot/github_actions/a…
mxpv Apr 1, 2026
e78d26e
Merge pull request #12962 from containerd/dependabot/github_actions/a…
mxpv Apr 1, 2026
56a6fdb
Update github.com/containerd/platforms to v1.0.0-rc.4
hsiangkao Mar 20, 2026
146930e
api: add `os_features` to api/types/platform.proto
hsiangkao Mar 20, 2026
cb93966
transfer: Default to the EROFS snapshotter and differ for EROFS images
hsiangkao Mar 20, 2026
f8367b8
client: remove toPlatforms()
hsiangkao Mar 31, 2026
9400764
client/image: check if the snapshotter supports forcely if `os.featur…
hsiangkao Mar 21, 2026
c45c886
Merge pull request #13142 from containerd/dependabot/go_modules/githu…
mxpv Apr 1, 2026
3a272ca
Merge pull request #13141 from containerd/dependabot/github_actions/g…
mxpv Apr 1, 2026
1b67e78
switch from k8s.io/apimachinery/pkg/util/httpstream to k8s.io/streami…
SergeyKanzhelev Mar 19, 2026
1fc92e6
switch from `internal/cri/streamingserver` to `k8s.io/cri-streaming`
SergeyKanzhelev Mar 20, 2026
1f0b0c4
Merge pull request #13091 from erofs/os_features
fuweid Apr 1, 2026
1d9fd7e
Merge pull request #13131 from fletcherw/nil-spec
mxpv Apr 2, 2026
2b70857
Skip TestExportAndImportMultiLayer on s390x
ricardobranco777 Apr 2, 2026
370010a
Merge pull request #13149 from ricardobranco777/skips390x
mxpv Apr 2, 2026
143c566
update runc binary to v1.4.2
ningmingxiao Apr 3, 2026
6c88546
Merge pull request #13076 from SergeyKanzhelev/useLatest136
mxpv Apr 3, 2026
2a69c0d
Honor stderrthreshold when logtostderr is enabled
pierluigilenoci Mar 26, 2026
05d3b31
pause image 3.10.1 -> 3.10.2 for add Windows Server 2025 (ltsc2025) s…
SergeyKanzhelev Apr 3, 2026
323d16f
Merge pull request #13156 from SergeyKanzhelev/pause3102
mxpv Apr 3, 2026
a3ac81f
releases: revive 2.0
samuelkarp Apr 3, 2026
38dafd7
Merge pull request #13155 from ningmingxiao/update_runc
fuweid Apr 4, 2026
78bcb44
Merge pull request #13132 from pierluigilenoci/fix/honor-stderrthreshold
mxpv Apr 4, 2026
169e000
Move runtime v2 docs to ./docs
mxpv Apr 4, 2026
574a607
Add: ResponseHeaderTimeout to image pull HTTP transport
Mujib-Ahasan Apr 4, 2026
924f643
Merge pull request #13163 from mxpv/runtime-docs
fuweid Apr 4, 2026
c586bec
Merge pull request #13036 from cpuguy83/fix_data_digest
mxpv Apr 5, 2026
04b7b49
internal/fsview: add fsview package for reading snapshot mounts
dmcgowan Feb 7, 2026
c1eb943
pkg/oci: update OCI spec generation to use fsview if available
dmcgowan Feb 7, 2026
f384d2e
pkg/oci: update OCI with user to try mount for Darwin
dmcgowan Feb 9, 2026
a5df278
pkg/oci: remove darwin guards from user/group spec opts
robmry Feb 26, 2026
2fe15d7
internal/fsview: add support for suffixes in formatted mounts
dmcgowan Mar 25, 2026
a77c757
internal/fsview: update overlay to handle file replacing directory
dmcgowan Mar 25, 2026
21d666c
Update fsview to allow type registration
dmcgowan Apr 2, 2026
30951c6
Add overlay symlink resolution using ReadLinkFS
dmcgowan Apr 2, 2026
22e6e15
Add binary-v2 logging readiness scheme
tao12345666333 Nov 29, 2025
cf77297
process/io: ignore SIGTERM exit in cancel() to fix flaky test
tao12345666333 Apr 4, 2026
86c36c6
Merge pull request #12595 from tao12345666333/fix-binary-logging
fuweid Apr 5, 2026
72919fb
integration/images: add s390x builds for volume test images
tao12345666333 Apr 6, 2026
1615e07
replace one more k8s.io/apimachinery/ reference
SergeyKanzhelev Apr 3, 2026
9b9e505
Merge pull request #13166 from tao12345666333/add-s390x-volume-test-i…
estesp Apr 6, 2026
e373060
Merge pull request #13157 from SergeyKanzhelev/forgottenRename
mxpv Apr 6, 2026
121f3a2
Add transfer types for container filesystem copy
dmcgowan Apr 3, 2026
244d59f
build(deps): bump docker/login-action from 4.0.0 to 4.1.0
dependabot[bot] Apr 6, 2026
69f3860
build(deps): bump the otel group with 6 updates
dependabot[bot] Apr 6, 2026
affe093
build(deps): bump github.com/Microsoft/hcsshim
dependabot[bot] Apr 6, 2026
c61c4e8
pkg/oci: update fs error handling to use errors.Is
dmcgowan Apr 7, 2026
6ba507b
Temporarily disable windows periodic tests until GCP credentials are …
apurv15 Apr 7, 2026
6d11c84
Merge pull request #13158 from samuelkarp/revive-2.0
dmcgowan Apr 7, 2026
8b396c7
Bump Go to 1.26.2
SergeyKanzhelev Apr 7, 2026
17cdec2
Merge pull request #12206 from wjordan/push-namespace
dmcgowan Apr 7, 2026
790b0ea
Implement shim bootstrap protocol
mxpv Jan 23, 2026
7f39b2d
Update shim to support new bootstrap api
mxpv Jan 24, 2026
e72145b
Update vendor
mxpv Jan 24, 2026
5ea993b
Pass runc options as a separate extension
mxpv Jan 24, 2026
3831fc8
Fix reading from stdin
mxpv Jan 24, 2026
fc8062f
Rename CommandConfig field to better reflect their purpose
mxpv Jan 24, 2026
fa02ace
Generate shim CLI flags under Command
mxpv Jan 24, 2026
9e9a095
Read spec annotations from file
mxpv Jan 24, 2026
acb8c8e
Update vendor
mxpv Jan 24, 2026
b7ef291
Provide bootstrap params when launching shims
mxpv Jan 24, 2026
f71c2e4
Reformat and clean proto files
mxpv Feb 7, 2026
31d0bbb
Include containerd version when launching shim
mxpv Feb 7, 2026
d957b1b
Use log level instead of debug flag
mxpv Feb 7, 2026
58022a7
Parse log level when starting shim instance
mxpv Mar 13, 2026
0f55bdd
Fix extensions API and update tests
mxpv Mar 13, 2026
2005e01
Run tests from api
mxpv Mar 13, 2026
281fb85
Fix Makefile
mxpv Mar 13, 2026
eea1fa6
Do not fail when failed to parse log level
mxpv Mar 18, 2026
1852a47
Remove testify dependency from api
mxpv Mar 18, 2026
3fbdb13
Fix module path
mxpv Mar 19, 2026
243cab5
Deprecate old pkg/shim interfaces
dmcgowan Mar 19, 2026
73edc80
Format code after cherry pick
mxpv Mar 19, 2026
9dc864f
Switch to proto instead of json
mxpv Mar 19, 2026
9bf65dc
Use enums instead of strings for capabilities and log level
mxpv Mar 19, 2026
3c0e8a5
Update comments wording about when to deprecate and remove the old path
mxpv Mar 19, 2026
45b7de2
Limit amount of bytes read from stdin
mxpv Apr 2, 2026
16b7ce2
Address code review suggestions
mxpv Apr 2, 2026
75afbe1
Update vendor
mxpv Apr 2, 2026
c045462
Merge pull request #13177 from SergeyKanzhelev/go1.26.2
AkihiroSuda Apr 8, 2026
737980d
Merge pull request #12786 from mxpv/bootstrap
mxpv Apr 8, 2026
d0dd748
Merge pull request #13169 from containerd/dependabot/go_modules/otel-…
mxpv Apr 8, 2026
b52893b
Merge pull request #13165 from dmcgowan/add-transfer-copy-types
mxpv Apr 9, 2026
47cfd11
diff/walking: enable mount manager
hsiangkao Apr 8, 2026
0b16455
Merge pull request #13186 from erofs/walking_differ
dmcgowan Apr 9, 2026
fcb2300
Document shim bootstrap protocol behavior
mxpv Apr 8, 2026
a755ca1
Merge pull request #12865 from dmcgowan/readonly-overlay-erofs-no-mount
dmcgowan Apr 9, 2026
d9772b5
Merge pull request #13170 from containerd/dependabot/go_modules/githu…
mxpv Apr 9, 2026
1e98eba
fix(windows): verify pipe readiness before returning shim address
eginez Apr 9, 2026
01e5fa6
fix: address review feedback on awaitPipeReady
eginez Apr 9, 2026
432d02d
Merge pull request #13173 from apurv15/main
mxpv Apr 10, 2026
b1df33f
Merge pull request #13192 from mxpv/sbp-docs
samuelkarp Apr 10, 2026
743210e
Make utils.sh nounset-safe by never expanding unset CGROUP_DRIVER on …
apurv15 Apr 10, 2026
32d2360
Merge pull request #13202 from eginez/dev/eginez/fix-npipe-dialer-win…
estesp Apr 10, 2026
a6311a1
Bump cri-api to v0.36.0-rc.0
HirazawaUi Apr 10, 2026
e62fd80
Add test for org.opencontainers.image.ref.name grammar
lauralorenz Apr 6, 2026
fec42a8
Merge pull request #13205 from apurv15/main
samuelkarp Apr 10, 2026
8b31ac6
Merge pull request #13207 from HirazawaUi/bump-cri-to-v0.36.0-rc.0
mxpv Apr 10, 2026
2c102c6
Update bootstrap API log level definition
dmcgowan Apr 10, 2026
74b465d
Merge pull request #13208 from dmcgowan/update-bootstrap-log-levels
dmcgowan Apr 11, 2026
c6f83d3
Update mailmap for Chris Henzie
dmcgowan Apr 11, 2026
d11731c
Update vendored api to v1.11.0-beta.1
dmcgowan Apr 11, 2026
212b10b
Merge pull request #13209 from dmcgowan/prepare-v2.3.0-beta.1
dmcgowan Apr 11, 2026
c41939a
For Exec format error on Windows, compile cri-integration.test binary…
apurv15 Apr 11, 2026
d8906ac
Update Makefile
apurv15 Apr 11, 2026
915fd25
update runhcs to v0.15.0-rc.1
thaJeztah Apr 11, 2026
2f5d5ce
Merge pull request #13168 from containerd/dependabot/github_actions/d…
mxpv Apr 11, 2026
054a4a3
Merge pull request #13210 from apurv15/main
mxpv Apr 11, 2026
ece682c
Merge pull request #13211 from thaJeztah/bump_runhcs
dmcgowan Apr 12, 2026
83044a4
Merge pull request #13128 from thaJeztah/windows_system_pool
dmcgowan Apr 12, 2026
b9445fb
erofs-differ: support zstd-wrapped EROFS layers
hsiangkao Apr 8, 2026
997f813
Merge pull request #13185 from erofs/erofs-layers
fuweid Apr 12, 2026
3b357da
snapshotter/erofs: avoid using overlay if fsmerge is enabled and no u…
hsiangkao Apr 13, 2026
d15a469
update github.com/moby/spdystream v0.5.1
samuelkarp Apr 13, 2026
f006ee0
Merge pull request #13215 from samuelkarp/update-spdystream
samuelkarp Apr 13, 2026
a9acbca
build(deps): bump softprops/action-gh-release from 2.6.1 to 3.0.0
dependabot[bot] Apr 13, 2026
54bb418
build(deps): bump actions/github-script from 8.0.0 to 9.0.0
dependabot[bot] Apr 13, 2026
34884e9
build(deps): bump actions/cache from 5.0.4 to 5.0.5
dependabot[bot] Apr 13, 2026
ef692c9
build(deps): bump the golang-x group with 2 updates
dependabot[bot] Apr 13, 2026
bf57a0d
build(deps): bump actions/upload-artifact from 7.0.0 to 7.0.1
dependabot[bot] Apr 13, 2026
a9e9580
build(deps): bump github.com/erofs/go-erofs from 0.2.0 to 0.2.1
dependabot[bot] Apr 13, 2026
270916a
Parameterize K8s version in node-e2e workflow
chrishenzie Apr 14, 2026
93419ae
Merge pull request #13228 from containerd/dependabot/go_modules/golan…
mxpv Apr 14, 2026
6b24521
Merge pull request #13226 from containerd/dependabot/github_actions/a…
mxpv Apr 14, 2026
78a7807
Merge pull request #13232 from containerd/dependabot/go_modules/githu…
mxpv Apr 14, 2026
896766c
Merge pull request #13225 from containerd/dependabot/github_actions/s…
samuelkarp Apr 14, 2026
95cc75c
Merge pull request #13213 from erofs/erofs-fixes
mxpv Apr 15, 2026
bd02dc1
Add support for conditional gc references in metadata
dmcgowan Oct 23, 2025
046421a
Breakout arguments to sendLabelRefs in gc
dmcgowan Mar 14, 2026
b320d3c
ctr: add EROFS image conversion support
ChengyuZhu6 Nov 21, 2025
64a2e62
erofs: wire os.features into conversion and selection
ChengyuZhu6 Mar 17, 2026
d7ed3bf
Merge pull request #12555 from ChengyuZhu6/ctr-erofs
dmcgowan Apr 15, 2026
d806373
Make shim socket directory use configured state
dmcgowan Jan 14, 2026
59c3464
Remove the unnecessary mkdir on the default state directory
dmcgowan Jan 14, 2026
e07a1aa
Add configuration for socket directory to the shim manager
dmcgowan Jan 14, 2026
341401c
Merge pull request #12785 from dmcgowan/pass-socket-address
AkihiroSuda Apr 15, 2026
3679372
Update API to use latest beta tag
dmcgowan Apr 15, 2026
608e75c
Merge pull request #13227 from containerd/dependabot/github_actions/a…
mxpv Apr 15, 2026
0fd46be
Merge pull request #12398 from dmcgowan/gc-conditional-references
fuweid Apr 15, 2026
75d32fd
Check for digest only when setting org.opencontainers.image.ref.name
lauralorenz Apr 6, 2026
c6cf634
Merge pull request #12262 from doddi/fix-check-status-code-on-fetch
samuelkarp Apr 15, 2026
2642193
Merge pull request #13234 from chrishenzie/parameterize-k8s-version
samuelkarp Apr 17, 2026
8a53373
Merge pull request #13239 from dmcgowan/prepare-v2.3.0-beta.2
mxpv Apr 17, 2026
6a17629
Merge pull request #12992 from AutuSnow/fix-fuzz-timeout
samuelkarp Apr 17, 2026
5fa03e6
Merge pull request #13164 from Mujib-Ahasan/add-ResponseHeaderTimeout
mikebrow Apr 20, 2026
93f7a62
Support both styles of volatile mount option
chrishenzie Apr 20, 2026
3f1c5fd
cri/windows: propagate AffinityCpus through update and status paths
zylxjtu Apr 9, 2026
54d7c96
Document Sandbox API
mxpv Apr 20, 2026
3bdbb0a
build(deps): bump github/codeql-action from 4.35.1 to 4.35.2
dependabot[bot] Apr 21, 2026
62e835e
build(deps): bump github.com/erofs/go-erofs from 0.2.1 to 0.3.0
dependabot[bot] Apr 21, 2026
80ec03f
core/mount: Fix mount manager activation error when already exists
dmcgowan Mar 25, 2026
f62bce2
pkg/rootfs: remove unused InitRootFS and related helpers
Sanil2108 Apr 18, 2026
eb62cdc
Fix transfer server not setting prefix extra references
dmcgowan Dec 10, 2025
2f5b05f
Merge pull request #13201 from zylxjtu/main
estesp Apr 21, 2026
71191c7
Improve support for non-canonical digests (sha512, etc)
tianon Apr 1, 2026
c5abec0
Add a warning when re-hash occurs during blob commit
tianon Apr 2, 2026
84ac5de
Merge pull request #13256 from chrishenzie/fix-volatile-mount-check
fuweid Apr 21, 2026
06c2356
Add new server plugin type use for debug server
dmcgowan Nov 20, 2025
c15ec24
Add server plugins for grpc and ttrpc
dmcgowan Nov 22, 2025
a2b1907
Add metrics server plugin
dmcgowan Nov 24, 2025
841c518
Add tests for serviceMigrate config migration
dmcgowan Apr 20, 2026
5d8c143
Update restart monitor test to not use deprecated address field
dmcgowan Nov 25, 2025
8ea37c4
Update fuzz to use new config location
dmcgowan Nov 25, 2025
a0f3c53
Ensure Plugins is not nil during migration
dmcgowan Dec 5, 2025
4dc3d6d
Default to euid/egid in ttrpc & grpc server plugins
akerouanton Dec 12, 2025
5098311
Update docs for version 4 server plugin configuration
dmcgowan Apr 20, 2026
a2f6401
Merge pull request #13262 from containerd/dependabot/go_modules/githu…
samuelkarp Apr 22, 2026
46a7bd7
Merge pull request #12562 from dmcgowan/plugin-api-handlers
fuweid Apr 22, 2026
557c54b
sandbox: forward Create fields, fix event topics
willmyrs Apr 20, 2026
3bb1cc7
Merge pull request #13260 from willmyrs/main
estesp Apr 22, 2026
a60d8a7
Merge pull request #13261 from containerd/dependabot/github_actions/g…
mxpv Apr 22, 2026
948f292
Merge pull request #13229 from containerd/dependabot/github_actions/a…
mxpv Apr 22, 2026
1919564
Merge pull request #13147 from tianon/sha512
samuelkarp Apr 22, 2026
d88e83a
apparmor: Set abi conditionally
cpuguy83 Apr 22, 2026
b3e484a
Merge pull request #13268 from cpuguy83/fix_apparmor_old
samuelkarp Apr 23, 2026
c30f234
cri: use upstream Kubernetes modules
dims Apr 22, 2026
95b4fd6
Merge pull request #13267 from dims/pr13078-rebase-main-k8s-v0.36.0
dims Apr 23, 2026
ec140ec
Add GC labels to images created as extra references
dmcgowan Dec 10, 2025
a3f3103
Add GC log when image is removed via GC
dmcgowan Dec 10, 2025
978c03f
Update import tests to handle index and manifest digests
dmcgowan Apr 22, 2026
1aef548
Merge pull request #12667 from dmcgowan/transfer-extrarefs-gc
fuweid Apr 24, 2026
f7150e2
Merge pull request #13126 from dmcgowan/handle-mount-already-exists
samuelkarp Apr 24, 2026
5125a2a
chore: update go-jose for CVE-2026-34986
chrischangcode Apr 24, 2026
1b71eee
Merge pull request #12648 from jokemanfire/optimize
dmcgowan Apr 24, 2026
247b4ae
Merge pull request #13251 from Sanil2108/remove-unused-init-rootfs
fuweid Apr 25, 2026
9c8111b
dmverity: enhance MetadataPath() with suffix checking
Apokleos Apr 23, 2026
31ca428
snapshots/erofs: pass dm-verity metadata path via mount options
Apokleos Apr 23, 2026
f9372ec
Merge pull request #13269 from Apokleos/erofs-dmverity-label
fuweid Apr 25, 2026
b6a45a1
Merge pull request #13286 from chrischangcode/cve-2026-34986
mxpv Apr 26, 2026
99ba342
Merge pull request #13259 from mxpv/sandbox-docs
mikebrow Apr 26, 2026
1b1aba4
Added stop signal to container termination logic and container status
sreeram-venkitesh Jan 6, 2026
f04c0f0
Update Hudson Zhu mailmap
dmcgowan Apr 24, 2026
31098d4
Update release-notes for v2.3.0 release dates
dmcgowan Apr 23, 2026
d54b553
Prepare v2.3.0-rc.0
dmcgowan Apr 27, 2026
d8e7c71
Merge pull request #11774 from sreeram-venkitesh/kep-4960-container-s…
mikebrow Apr 27, 2026
d713857
build(deps): bump github.com/containerd/go-dmverity
dependabot[bot] Apr 28, 2026
1696b04
build(deps): bump the otel group across 1 directory with 2 updates
dependabot[bot] Apr 28, 2026
14fe0ac
Merge pull request #13052 from delthas/fix-shim-sync
dmcgowan Apr 28, 2026
135a671
Merge pull request #13302 from dmcgowan/prepare-v2.3.0-rc
dmcgowan Apr 28, 2026
e25c936
Update mailmap
samuelkarp Apr 28, 2026
bf50266
Prepare api/v1.11.0-rc.0
dmcgowan Apr 28, 2026
efc8e12
bump github.com/containerd/nri to v0.12.0
samuelkarp Apr 28, 2026
7d9dc09
Merge pull request #13306 from dmcgowan/api-1.11-rc
mxpv Apr 28, 2026
40d7588
Force-add NRI pkg/version/info/none file
samuelkarp Apr 28, 2026
e6b4df0
Merge pull request #13305 from samuelkarp/mailmap
mxpv Apr 28, 2026
338d4a3
Merge pull request #13311 from samuelkarp/bump-nri
samuelkarp Apr 28, 2026
0a3363b
Move remote-snapshotter.md to docs/snapshotters
mxpv Apr 28, 2026
edf4004
Merge pull request #13303 from containerd/dependabot/go_modules/githu…
mxpv Apr 28, 2026
bc69a52
Merge pull request #13167 from lauralorenz/10681-ctr-image-export-oci…
samuelkarp Apr 28, 2026
5e907d7
Implement NRI metrics adaptation layer
chrishenzie Mar 17, 2026
20ee263
Merge pull request #13231 from containerd/dependabot/go_modules/otel-…
mxpv Apr 28, 2026
1dd95ac
Update plugin with optimizations that improve startup time
dmcgowan Apr 29, 2026
0bd6e54
Update to api v1.11.0-rc.0
dmcgowan Apr 29, 2026
c5ea950
Update continuity to v0.5.0
dmcgowan Apr 29, 2026
5ba1172
Merge pull request #13050 from chrishenzie/prototype/nri-metrics
samuelkarp Apr 29, 2026
d2d0575
Merge pull request #13313 from mxpv/docs
mxpv Apr 29, 2026
1d7b73d
Merge pull request #13315 from dmcgowan/update-containerd-dependencies
dmcgowan Apr 29, 2026
ac77917
config: preserve legacy grpc address across sparse imports
fuweid Apr 29, 2026
3e0ebf0
Deprecate shim.Command
mxpv Apr 29, 2026
6bd8288
mailmap: update for 2.3.0 release
samuelkarp Apr 29, 2026
90dd71c
Merge pull request #13318 from samuelkarp/mailmap
samuelkarp Apr 29, 2026
ce2955c
Merge pull request #13319 from mxpv/depr
mxpv Apr 29, 2026
8f2fce4
Prepare release notes for v1.11.0
dmcgowan Apr 29, 2026
b7f8c35
erofs: remove fsmerge threshold from snapshotter
dmcgowan Apr 29, 2026
ee17fa1
Merge pull request #13317 from fuweid/fix-merge-issue
dmcgowan Apr 30, 2026
e3d5fe8
Merge pull request #13322 from dmcgowan/prepare-api-v1.11.0
dmcgowan Apr 30, 2026
f49640e
Merge pull request #13321 from dmcgowan/remove-erofs-fsmerge-threshold
fuweid Apr 30, 2026
ebf4404
Update release document
dmcgowan Apr 30, 2026
c55ada3
Update api to v1.11.0
dmcgowan Apr 30, 2026
77eeb2d
Prepare release notes for v2.3.0
dmcgowan Apr 30, 2026
2976f38
Merge pull request #13325 from dmcgowan/prepare-v2.3.0
dmcgowan Apr 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
76 changes: 0 additions & 76 deletions .cirrus.yml

This file was deleted.

42 changes: 42 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright The containerd Authors.

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# For details, see https://github.com/devcontainers/images/tree/main/src/base-ubuntu
FROM mcr.microsoft.com/devcontainers/base:1-ubuntu-22.04

RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
gperf \
dmsetup \
bc \
software-properties-common \
libseccomp-dev \
xfsprogs \
lsof \
iptables \
autoconf \
automake \
g++ \
libtool \
acl \
&& rm -rf /var/lib/apt/lists/*

RUN add-apt-repository -y ppa:criu/ppa \
&& apt-get update \
&& apt-get install -y criu \
&& rm -rf /var/lib/apt/lists/*

RUN setfacl -PRdm u::rwx,g::rx,o::rx /tmp

COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
32 changes: 32 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// For format details, see https://aka.ms/devcontainer.json.
{
"name": "containerd",
"build": {
"context": "..",
"dockerfile": "Dockerfile"
},
"workspaceFolder": "/go/src/github.com/containerd/containerd",
"workspaceMount": "source=${localWorkspaceFolder},target=/go/src/github.com/containerd/containerd,type=bind,consistency=cached",

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.26.2"
}
},

"onCreateCommand": "sudo PATH=$PATH bash .devcontainer/setup.sh",
"postAttachCommand": {
"Runs all non-integration tests that do not require `root` privileges": "make test",
"Runs non-integration tests which require `root`": "sudo PATH=$PATH make root-test"
},

"remoteUser": "root",
"runArgs": [
"--ipc=host",
"--volume=/dev:/dev",
"--volume=/run/udev:/run/udev",
"--privileged"
]
}
28 changes: 28 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

# Copyright The containerd Authors.

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eux

script/setup/install-seccomp
script/setup/install-runc
script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}')
script/setup/install-critools
script/setup/install-failpoint-binaries
script/setup/install-gotestsum
script/setup/install-teststat

make binaries GO_BUILD_FLAGS="-mod=vendor"
sudo -E PATH=$PATH make install
7 changes: 7 additions & 0 deletions .devcontainer/welcome-message.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
👋 Welcome to "containerd" in GitHub Codespaces!

🛠️ Your environment is fully setup with all the required software.

🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).

ℹ️ Look at https://github.com/containerd/project/blob/main/CONTRIBUTING.md for contribution guidelines.
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/cri_kep.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: SIG-Node Integration
description: Tracking issue for SIG-Node integration work (including KEPs)
title: "[SIG-Node]: <KEP-number - Short Description>"
labels:
- kind/feature
- area/cri
assignees:
- mikebrow
- fuweid
- samuelkarp
body:
- type: textarea
attributes:
label: KEP/SIG-Node References
description: |
example:
- **KEP**: #
- **stage**: alpha|beta w/gate off|beta w/gate on|ga
- **KEP-Issue**: link
- **KEP-PR**: link
- **K8s-Release**: version where the KEP stage is scheduled to release or has released
- **KEP-Owner: id(s) SIG-Node member(s) that own the KEP of reference
- **SIG-Node member liaison: containerd maintainer(s) ensuring interop with sig-node
- **KEP-Shepherd: containerd owner assigned to this issue
value: |
- KEP(s):
- stage:
- KEP Issue:
- KEP PR:
- K8s-Release:
- KEP-Owner:
- SIG-Node member liason:
- KEP-Shepherd:
validations:
required: false

- type: textarea
attributes:
label: What is the SIG-Node problem you are trying to solve
description: |
A clear and concise description of the reason for the change(s) required in containerd.
validations:
required: true

- type: textarea
attributes:
label: Describe the solution you would like
description: |
A clear and concise description of design considerations that should be made when making the change(s).
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: |
Add any other context about the needed change here.
16 changes: 16 additions & 0 deletions .github/actions/install-go/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Setup Go"
description: "Reusable action to install Go, so there is one place to bump Go versions"
inputs:
go-version:
required: true
default: "1.26.2"
description: "Go version to install"

runs:
using: composite
steps:
- name: "Setup Go"
uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
cache: false # see actions/setup-go#368
25 changes: 25 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 2
updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
groups:
golang-x:
patterns:
- "golang.org/x/*"
k8s:
patterns:
- "k8s.io/*"
moby-sys:
patterns:
- "github.com/moby/sys/*"
otel:
patterns:
- "go.opentelemetry.io/*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
80 changes: 80 additions & 0 deletions .github/workflows/api-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
on:
push:
tags:
- "api/v*" # Push events to matching api/v*, i.e. api/v1.0, api/v20.15.10

name: API Release

env:
GO_VERSION: "1.26.2"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read

jobs:
check:
name: Check Signed Tag
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/api/v')
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
stringver: ${{ steps.contentrel.outputs.stringver }}

steps:
- name: Checkout code
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
ref: ${{ github.ref }}
path: src/github.com/containerd/containerd

- name: Check signature
run: |
releasever=${{ github.ref }}
releasever="${releasever#refs/tags/}"
TAGCHECK=$(git tag -v ${releasever} 2>&1 >/dev/null) ||
echo "${TAGCHECK}" | grep -q "error" && {
echo "::error::tag ${releasever} is not a signed tag. Failing release process."
exit 1
} || {
echo "Tag ${releasever} is signed."
exit 0
}
working-directory: src/github.com/containerd/containerd

- name: Release content
id: contentrel
run: |
RELEASEVER=${{ github.ref }}
echo "stringver=${RELEASEVER#refs/tags/api/v}" >> $GITHUB_OUTPUT
git tag -l ${RELEASEVER#refs/tags/} -n20000 | tail -n +3 | cut -c 5- >release-notes.md
working-directory: src/github.com/containerd/containerd

- name: Save release notes
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: containerd-release-notes
path: src/github.com/containerd/containerd/release-notes.md

release:
name: Create containerd Release
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/api/v')
permissions:
contents: write
runs-on: ubuntu-24.04
timeout-minutes: 10
needs: [check]
steps:
- name: Download release notes
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
path: builds
- name: Create Release
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
fail_on_unmatched_files: true
name: containerd API ${{ needs.check.outputs.stringver }}
draft: false
make_latest: false
prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
body_path: ./builds/release-notes.md
Loading