Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5279 commits
Select commit Hold shift + click to select a range
37f1885
build(deps): bump github/codeql-action from 4.31.5 to 4.31.6
dependabot[bot] Dec 2, 2025
adf2be7
Merge pull request #12611 from containerd/dependabot/github_actions/g…
dmcgowan Dec 2, 2025
6cbc285
Merge pull request #12609 from containerd/dependabot/go_modules/githu…
dmcgowan Dec 2, 2025
3981541
fix: refactor ListPodSandboxMetrics
fionera Nov 26, 2025
65ad60e
ci: bump Go 1.24.10, 1.25.4
austinvazquez Dec 3, 2025
127b163
ci: bump Go 1.24.11, 1.25.5
austinvazquez Dec 3, 2025
761e14b
Merge pull request #12615 from austinvazquez/update-go-120325
mxpv Dec 3, 2025
ebaf158
Merge pull request #12610 from containerd/dependabot/github_actions/s…
mxpv Dec 4, 2025
08b02ea
Merge pull request #12594 from monogon/list-pod-sandbox-metrics
dims Dec 4, 2025
d958fb2
ci: update CIFuzz actions to support Ubuntu 24.04
dims Dec 6, 2025
c012916
Merge pull request #12631 from dims/fix-oss-fuzz-by-updating-things-t…
fuweid Dec 6, 2025
508f8ca
add some log if blob is skipped to download
ningmingxiao Jul 25, 2025
c2bcc0e
Merge pull request #12140 from ningmingxiao/add_log
AkihiroSuda Dec 8, 2025
fb8c01d
build(deps): bump github.com/containerd/zfs/v2 from 2.0.0-rc.0 to 2.0.0
dependabot[bot] Dec 8, 2025
2d5a8cc
vendor: go.opentelemetry.io/otel/exporters v1.38.0
thaJeztah Dec 1, 2025
a0fa925
vendor: go.opentelemetry.io/contrib v0.63.0
thaJeztah Dec 1, 2025
d255706
Merge pull request #12604 from thaJeztah/bump_otels
mikebrow Dec 8, 2025
6e41c9e
Merge pull request #12641 from containerd/dependabot/go_modules/githu…
mikebrow Dec 8, 2025
9d5ee65
cri: Add background stats collector to calculate UsageNanoCores
dims Dec 4, 2025
7e5809b
stats_collection_period -> stats_collect_period
dims Dec 8, 2025
218ef16
Removed the circular dependency
dims Dec 8, 2025
28f7511
cri: simplify network stats to only add Timestamp field
dims Dec 8, 2025
ca0637f
build(deps): bump github/codeql-action from 4.31.6 to 4.31.7
dependabot[bot] Dec 8, 2025
7053b5c
build(deps): bump golangci/golangci-lint-action from 9.0.0 to 9.2.0
dependabot[bot] Dec 8, 2025
5c392ae
build(deps): bump the golang-x group with 3 updates
dependabot[bot] Dec 8, 2025
e72ce62
build(deps): bump actions/stale from 10.1.0 to 10.1.1
dependabot[bot] Dec 8, 2025
b094600
build(deps): bump actions/checkout from 6.0.0 to 6.0.1
dependabot[bot] Dec 8, 2025
216e43e
go.mod: remove exclude rules
thaJeztah Dec 9, 2025
640f0ee
Merge pull request #12649 from thaJeztah/no_exclude
AkihiroSuda Dec 9, 2025
a1a729d
Merge pull request #12646 from containerd/dependabot/github_actions/a…
estesp Dec 9, 2025
4c63120
Merge pull request #12645 from containerd/dependabot/github_actions/a…
estesp Dec 9, 2025
0a52ea3
Merge pull request #12643 from containerd/dependabot/github_actions/g…
estesp Dec 9, 2025
9d2097d
Merge pull request #12642 from containerd/dependabot/github_actions/g…
estesp Dec 9, 2025
17c7fdd
Merge pull request #12592 from wzshiming/ci/check-issue
estesp Dec 9, 2025
943fcd9
Merge pull request #12644 from containerd/dependabot/go_modules/golan…
estesp Dec 9, 2025
8ab6ef8
build(deps): bump the otel group across 1 directory with 8 updates
dependabot[bot] Dec 9, 2025
8d8004f
Merge pull request #12647 from containerd/dependabot/go_modules/otel-…
estesp Dec 9, 2025
f9b7482
Merge pull request #12629 from dims/updates-for-better-cri-resource-m…
mikebrow Dec 9, 2025
90cf47e
build(deps): bump github.com/containernetworking/plugins
dependabot[bot] Dec 10, 2025
2900a81
build(deps): bump github.com/intel/goresctrl from 0.10.0 to 0.11.0
dependabot[bot] Dec 10, 2025
e5267fc
Merge pull request #12656 from containerd/dependabot/go_modules/githu…
AkihiroSuda Dec 10, 2025
b9e7220
Merge pull request #12657 from containerd/dependabot/go_modules/githu…
AkihiroSuda Dec 10, 2025
19765c9
go.{mod,sum} bump CDI deps to v1.1.0.
klihub Dec 10, 2025
5054782
Merge pull request #12663 from klihub/devel/main/bump-cdi-deps
estesp Dec 10, 2025
0d27fce
pkg/tracing: HTTPStatusCodeAttributes: remove use of deprecated SemCo…
thaJeztah Dec 1, 2025
92c36c2
build(deps): bump actions/cache from 4.3.0 to 5.0.1
dependabot[bot] Dec 15, 2025
026d074
build(deps): bump the k8s group with 3 updates
dependabot[bot] Dec 15, 2025
9322000
build(deps): bump github/codeql-action from 4.31.7 to 4.31.8
dependabot[bot] Dec 15, 2025
e191976
build(deps): bump actions/upload-artifact from 5.0.0 to 6.0.0
dependabot[bot] Dec 15, 2025
87e0144
build(deps): bump actions/download-artifact from 6.0.0 to 7.0.0
dependabot[bot] Dec 15, 2025
f6acc05
Merge pull request #12686 from containerd/dependabot/github_actions/a…
AkihiroSuda Dec 16, 2025
bd1e76c
Merge pull request #12691 from containerd/dependabot/github_actions/a…
AkihiroSuda Dec 16, 2025
1aa780f
Merge pull request #12687 from containerd/dependabot/go_modules/k8s-f…
AkihiroSuda Dec 16, 2025
0480147
Merge pull request #12692 from containerd/dependabot/github_actions/a…
estesp Dec 16, 2025
6879e7e
build(deps): bump google.golang.org/protobuf from 1.36.10 to 1.36.11
dependabot[bot] Dec 16, 2025
5b18460
Fix typo in README.md for shim author section
Kaleab-Ayenew Dec 16, 2025
8462dec
Merge pull request #12689 from containerd/dependabot/github_actions/g…
estesp Dec 16, 2025
f0a8bfb
Merge pull request #12690 from containerd/dependabot/go_modules/googl…
estesp Dec 16, 2025
48baa31
Merge pull request #12605 from thaJeztah/bump_semconv
estesp Dec 16, 2025
c94b423
cri: emit warning for concurrent CreateContainer
samuelkarp Dec 16, 2025
d3ee5d6
Merge pull request #12694 from Kaleab-Ayenew/patch-1
AkihiroSuda Dec 17, 2025
c49379c
cri: deprecate the enable_cdi config option.
klihub Dec 11, 2025
ec89339
cri: treat disabled CDI an error for injection requests.
klihub Dec 11, 2025
d674423
go.{mod,sum}: bump NRI deps to v0.11.0, re-vendor.
klihub Dec 17, 2025
8e143b2
cri,nri: pass any linux I/O priority to plugins.
klihub Apr 10, 2025
239f69a
cri,nri: pass any linux scheduler attributes to plugins.
klihub Dec 17, 2025
eb616d8
cri,nri: pass any linux net devices to plugins.
klihub Dec 17, 2025
f202a69
cri,nri: pass any linux RDT constraints to plugins.
klihub Dec 17, 2025
6936558
cri,nri: pass any linux security profile to plugins.
klihub Dec 17, 2025
3d8c1cc
Merge pull request #12699 from klihub/devel/main/bump-nri-deps
mikebrow Dec 17, 2025
6faacd8
simplify selinux dependency in client
wadey Dec 17, 2025
c0052e1
Reinstate image decryption
cadeniyi Dec 18, 2025
92fec18
Merge pull request #12705 from cadeniyi/fix-image-decryption
mikebrow Dec 19, 2025
f2ad3ae
cri: move noisy CDI logs to debug level
samuelkarp Dec 19, 2025
78cb5b5
Merge pull request #12715 from samuelkarp/noisy-cdi
mxpv Dec 19, 2025
b8ae041
cri: Use the runtimeHandler parameter in PullImage
fidencio Dec 19, 2025
635b301
Ensure ListMetricDescriptors gets tested with latest k/k
dims Dec 18, 2025
a31236b
cri: populate Network.Interfaces in PodSandboxStats on Linux
dims Dec 19, 2025
34ba1ea
Merge pull request #12675 from klihub/fixes/main/error-on-disabled-cdi
mikebrow Dec 20, 2025
25dde29
Merge pull request #12704 from dims/ensure-ListMetricDescriptors-gets…
dims Dec 22, 2025
b58f657
Drop skip for `[Feature:ResourceMetrics]` in node e2e tests
dims Dec 22, 2025
cdc828f
Merge pull request #12710 from fidencio/fix-snapshotter-per-runtime-h…
mikebrow Dec 22, 2025
90e8fb9
Merge pull request #12720 from dims/drop-skip-for-Feature-ResourceMet…
dims Dec 22, 2025
ddc35ac
build(deps): bump docker/setup-buildx-action from 3.11.1 to 3.12.0
dependabot[bot] Dec 22, 2025
4d7ce17
build(deps): bump actions/attest-build-provenance from 3.0.0 to 3.1.0
dependabot[bot] Dec 22, 2025
b3fdd83
build(deps): bump github/codeql-action from 4.31.8 to 4.31.9
dependabot[bot] Dec 22, 2025
36f8999
images: add EROFS layer media type
ChengyuZhu6 Nov 24, 2025
1e154a8
Merge pull request #12695 from samuelkarp/concurrent-create-container
mikebrow Dec 23, 2025
01fd590
pkg/oci: add WithUmask for SpecOpts
zhangyoufu Dec 22, 2025
5566f35
Merge pull request #12719 from zhangyoufu/patch-1
mikebrow Dec 24, 2025
9a7500a
Add support for EROFS fsmerge feature
hsiangkao Oct 15, 2025
53e696d
set annotations parameter in CreateSandbox request
rawahars Nov 24, 2025
e7ba3c3
build(deps): bump google.golang.org/grpc from 1.77.0 to 1.78.0
dependabot[bot] Dec 29, 2025
31594c0
Merge pull request #12374 from erofs/erofs-snapshotter-fsmerge
AkihiroSuda Dec 30, 2025
03a7310
Merge pull request #12736 from containerd/dependabot/go_modules/googl…
estesp Dec 30, 2025
86e4128
Merge pull request #12724 from containerd/dependabot/github_actions/g…
estesp Dec 30, 2025
964ffd3
Merge pull request #12723 from containerd/dependabot/github_actions/a…
estesp Dec 30, 2025
2d8e4b6
Merge pull request #12722 from containerd/dependabot/github_actions/d…
estesp Dec 30, 2025
44751e2
core/mount: Don't apply uidmap/gidmap during ro instrospection
halaney Oct 28, 2025
5525003
core/mount/*linux: Do idmap bind mounts as private and recursive
halaney Oct 28, 2025
9b50650
snapshots/erofs: Support idmap mounts
halaney Oct 28, 2025
2bddff3
Merge pull request #12566 from rawahars/main
mxpv Jan 5, 2026
7b63291
Merge pull request #12702 from wadey/simplify-client-mount-label
mxpv Jan 5, 2026
b66f92f
cri: update log level to warn for CNI load failure during init
singholt Dec 22, 2025
7d1514a
Merge pull request #12709 from singholt/cni-load-fix
kzys Jan 6, 2026
415b5a5
Merge pull request #12567 from ChengyuZhu6/erofs-mediatype
dmcgowan Jan 6, 2026
b5ee44f
add k8s 1.35 to support matrix
akhilerm Jan 6, 2026
253fbe7
Cleanup unit tests
mxpv Jan 6, 2026
d6ee6f6
Fix ST1005 lint violations: lowercase error strings
aadhar-agarwal Dec 10, 2025
4d47b9a
Merge pull request #12749 from akhilerm/1.35-support-matrix
mxpv Jan 7, 2026
4dd1489
Merge pull request #12746 from mxpv/tests
fuweid Jan 7, 2026
1e3446f
Merge pull request #12666 from aadhar-agarwal/aadagarwal/fix-st1005
mxpv Jan 7, 2026
21707e6
cmd/containerd-shim-runc-v2: add experimental OOM package
fuweid Dec 18, 2025
8ac7e3c
cmd/containerd-shim-runc-v2: use experimental OOM package
fuweid Dec 18, 2025
aa3c507
internal/cri/server: check if OOM event occurred before update status
fuweid Dec 19, 2025
cbb1b13
cri-integration: add stress test for TestOOMEventMonitor
fuweid Dec 19, 2025
bdff34e
*: skip critest OOMKilled testcase for systemd cgroup
fuweid Dec 22, 2025
016f4a6
*: move new oom package into internal
fuweid Jan 7, 2026
a800acb
Merge pull request #12714 from fuweid/fix-oom-issue
fuweid Jan 7, 2026
ffd3691
Implement UpdatePodSandboxResources CRI API handler
chrishenzie Feb 5, 2025
de5b622
Persist pod sandbox resource updates
chrishenzie Oct 6, 2025
01fa057
Add Parent option handling in Commit method and tests
aledbf Jan 7, 2026
85b5418
fix(oci): handle absolute symlinks in rootfs user lookup
pauloappbr Dec 27, 2025
2bf3fcf
Merge pull request #11406 from chrishenzie/update-pod-sandbox-api
mxpv Jan 8, 2026
e63f1d3
Use buf to generate proto code
mxpv Jan 8, 2026
eb586b5
Regenerate proto files
mxpv Jan 8, 2026
aca62ae
Install buf on demand via go install
mxpv Jan 8, 2026
edb3e08
Remove protobuf
mxpv Jan 8, 2026
fb295b9
Tracing: add spans in task/metadata and sandbox paths
Cindia-blue Dec 4, 2025
39991b6
Use relative import intead of GOPATH style imports
mxpv Jan 9, 2026
248ee80
Remove GOPATH workaround from Makefile
mxpv Jan 9, 2026
57782b7
Move buf configuration under api/
mxpv Jan 9, 2026
6a62831
Update pb files
mxpv Jan 9, 2026
dac9721
Drop outdated pb.txt files
mxpv Jan 9, 2026
f87550d
Install buf from install-dev-tools
mxpv Jan 9, 2026
f1c9951
Merge pull request #12737 from Cindia-blue/tracing-followups
fuweid Jan 9, 2026
9d247a7
Merge pull request #12433 from halaney/ahalaney/erofs-idmap-latest
AkihiroSuda Jan 9, 2026
250388d
cri,nri: pass linux sysctl to plugins.
klihub Jan 9, 2026
0dc9582
cri: fix checkpoint failed with short id
ningmingxiao Jan 8, 2026
a49ed60
Merge pull request #12762 from mxpv/proto
fuweid Jan 9, 2026
98a2e88
cri,nri: pass injected CDI devices to plugins.
klihub Jan 9, 2026
19f39fe
Remove protoc dependency from BUILDING.md
estesp Jan 9, 2026
8e2aa0b
Merge pull request #12766 from klihub/devel/main/nri-input/sysctl
dmcgowan Jan 9, 2026
04366a9
Merge pull request #12767 from klihub/devel/main/nri-input/cdi-devices
mxpv Jan 9, 2026
3bcdbd8
Merge pull request #12771 from estesp/buf-followup
mxpv Jan 10, 2026
695c913
cri,nri: pass extended container status to NRI.
klihub Jan 9, 2026
1bc4ec5
Merge pull request #12770 from klihub/devel/main/nri-input/container-…
mxpv Jan 10, 2026
7b85525
cri,nri: pass any POSIX rlimits to plugins.
klihub Jan 9, 2026
9018c75
cri: fix create container panic if originalAnnotations is nil when re…
ningmingxiao Jan 9, 2026
cdc56ea
Merge pull request #12758 from ningmingxiao/check_point_1
fuweid Jan 12, 2026
eb888dc
Merge pull request #12765 from klihub/devel/main/nri-input/rlimits
dmcgowan Jan 12, 2026
5f0f0dc
content: ensure root directory exists before checking fs-verity support
ningmingxiao Oct 26, 2025
cfec4b3
cri,nri: pass seccomp policy to plugins.
klihub Jan 9, 2026
1be5831
Merge pull request #12768 from klihub/devel/main/nri-input/seccomp-po…
mxpv Jan 12, 2026
1b4f588
Detect breaking API changes in protos
mxpv Jan 13, 2026
ddb6b16
build(deps): bump the golang-x group with 2 updates
dependabot[bot] Jan 13, 2026
ac70789
build(deps): bump github/codeql-action from 4.31.9 to 4.31.10
dependabot[bot] Jan 13, 2026
677e991
command: show help and exit on unknown positional arguments
ningmingxiao Jan 6, 2026
f7ecfc5
Merge pull request #12779 from containerd/dependabot/github_actions/g…
AkihiroSuda Jan 13, 2026
4ef0e72
Merge pull request #12778 from containerd/dependabot/go_modules/golan…
AkihiroSuda Jan 13, 2026
b0bd04b
cri,nri: pass container user (uid, gids) to plugins.
klihub Jan 9, 2026
e9dc15b
Merge pull request #12776 from mxpv/breaking
mikebrow Jan 13, 2026
7ef50ac
Reduce ImageService interface dependencies
mxpv Jan 10, 2026
704a2ff
Merge pull request #12763 from ningmingxiao/chekpoint_2
fuweid Jan 13, 2026
87a16b2
Merge pull request #12769 from klihub/devel/main/nri-input/container-…
mxpv Jan 13, 2026
bb12a6c
Merge pull request #12755 from aledbf/aledbf/snapshot-parent
fuweid Jan 13, 2026
f0e04e5
Merge pull request #12416 from ningmingxiao/fix_content_dir
fuweid Jan 13, 2026
9bbb130
test(oci): use fstest and mock fs for better symlink coverage
pauloappbr Jan 13, 2026
9cd2e74
Merge pull request #12748 from ningmingxiao/fix_args
samuelkarp Jan 14, 2026
cb15e73
Merge pull request #12732 from pauloappbr/fix/12683-go124-symlink-res…
samuelkarp Jan 14, 2026
52a92e8
erofs-differ: use same UUID append style in tar index mode as tar con…
aadhar-agarwal Jan 12, 2026
42ce92b
pkg/sys: Create user namespace as the container's initial user namesp…
halaney Sep 22, 2025
59cc4cc
pkg/sys: Let more environments create user namespace as the initial user
halaney Jan 13, 2026
ce045ca
Fix go mod replace
mxpv Jan 15, 2026
c895e1e
Remove check-api-descriptors target
mxpv Jan 15, 2026
8c782cd
Revendor latest api changes
mxpv Jan 15, 2026
992597b
Fix TTRPC prefix
mxpv Jan 15, 2026
fb80501
Merge pull request #12773 from mxpv/podsandbox
mxpv Jan 17, 2026
f873e4d
plugins/mount/erofs: use fsmount API to avoid PAGE_SIZE limit
ChengyuZhu6 Jan 6, 2026
e066861
fix: typo in comment
NAM-MAN Jan 17, 2026
669ddc4
Merge pull request #12795 from NAM-MAN/fix-typo
mxpv Jan 19, 2026
92955bf
build(deps): bump github.com/klauspost/compress from 1.18.2 to 1.18.3
dependabot[bot] Jan 19, 2026
7a0c8d9
build(deps): bump actions/cache from 5.0.1 to 5.0.2
dependabot[bot] Jan 19, 2026
94de254
build(deps): bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4
dependabot[bot] Jan 19, 2026
4fb4c9d
Merge pull request #12783 from ChengyuZhu6/mount
fuweid Jan 20, 2026
f6f9f86
Merge pull request #12799 from containerd/dependabot/go_modules/githu…
fuweid Jan 20, 2026
ab75372
Merge pull request #12798 from containerd/dependabot/github_actions/a…
mxpv Jan 20, 2026
6a0a7e3
Merge pull request #12797 from containerd/dependabot/go_modules/githu…
mxpv Jan 20, 2026
7b11d6c
fix: sanitize error before gRPC return to prevent credential leak in …
aadhar-agarwal Jan 20, 2026
207bf2b
Merge pull request #12801 from aadhar-agarwal/aadagarwal/sanitize-grp…
mxpv Jan 21, 2026
cf7cb3c
erofs: Move immutable file handling before storage.Remove
lujinda Jan 21, 2026
1544bfb
Merge pull request #12807 from lujinda/errofs_remove_fix
fuweid Jan 21, 2026
10cf3c8
Merge pull request #12782 from aadhar-agarwal/aadagarwal/fix-uuid
fuweid Jan 21, 2026
e86523e
multipart fetch stability fixes
azr Jan 23, 2026
ece659c
Merge pull request #12205 from azr/multipart-fetch-stability
fuweid Jan 23, 2026
b8c7619
cri: populate ImageId field in container status
avin3sh Jan 15, 2026
2470af5
Update TestToCRIContainer test
avin3sh Jan 15, 2026
f496ee8
Merge pull request #12789 from mxpv/replace
mxpv Jan 23, 2026
f58dbbd
Add buf.build repository name for publishing API
dmcgowan Jan 24, 2026
472e0a8
Generate next.txtpb to replace next.pb.txt
dmcgowan Jan 24, 2026
c6d6c8a
Merge pull request #12815 from dmcgowan/proto-build-publish
mxpv Jan 24, 2026
816a845
Merge pull request #12787 from avin3sh/avin3sh-fix-populate-image-id-…
mikebrow Jan 24, 2026
ce9f3ad
.github: re-enable windows image pull/list tests
fuweid Jan 26, 2026
883ac7a
Merge pull request #12818 from fuweid/fix-12580
estesp Jan 26, 2026
cf9b7d4
build(deps): bump actions/attest-build-provenance from 3.1.0 to 3.2.0
dependabot[bot] Jan 27, 2026
ff0c2d1
CI: add almalinux/10
AkihiroSuda Jan 27, 2026
1ca5809
Merge pull request #12827 from AkihiroSuda/ci-almalinux-10
mxpv Jan 27, 2026
220108e
erofs: Log mkfs command at Debug level
aadhar-agarwal Jan 23, 2026
652f41f
Merge pull request #12826 from aadhar-agarwal/aadagarwal/erofs-mkfs-l…
samuelkarp Jan 28, 2026
317286a
Merge pull request #12581 from ticpu/fix-12549-ctr-image-mount-fails-…
AkihiroSuda Jan 28, 2026
3defa12
Use buf to format proto files
mxpv Jan 31, 2026
2a87c9d
Add .editorconfig for proto files
mxpv Jan 31, 2026
ca1c5b2
Reformat and revendor proto files
mxpv Jan 31, 2026
c3ba452
script/critest.sh: always skip OOMKilled on systemd cgroup
fuweid Jan 26, 2026
bde3dea
ci: bump go 1.24.12, 1.25.6
akhilerm Feb 1, 2026
b99b82d
Merge pull request #12843 from akhilerm/go-1.25.6-update
mxpv Feb 2, 2026
eeb50b0
cri: use mount manager when image has volumes
Champ-Goblem Feb 2, 2026
3f133ac
set fetch-depth for containerd to 0 for version parsing
akhilerm Feb 3, 2026
9609392
Merge pull request #12855 from akhilerm/fix-fetch-tag
estesp Feb 3, 2026
e1ab552
ci: add retry logic for Fedora Vagrant box download
aadhar-agarwal Feb 3, 2026
74b21a9
build(deps): bump github.com/coreos/go-systemd/v22 from 22.6.0 to 22.7.0
dependabot[bot] Feb 4, 2026
672abce
Merge pull request #12856 from aadhar-agarwal/aadagarwal/fix-vagrant-…
AkihiroSuda Feb 4, 2026
3f32d77
build(deps): bump docker/login-action from 3.6.0 to 3.7.0
dependabot[bot] Feb 4, 2026
e00bd60
build(deps): bump github/codeql-action from 4.31.10 to 4.32.1
dependabot[bot] Feb 4, 2026
0be2e1b
build(deps): bump actions/cache from 5.0.2 to 5.0.3
dependabot[bot] Feb 4, 2026
9ce5a34
Merge pull request #12317 from halaney/ahalaney/make-user-namespace-a…
AkihiroSuda Feb 4, 2026
28cad51
Merge pull request #12854 from containerd/dependabot/go_modules/githu…
estesp Feb 4, 2026
987c173
Merge pull request #12851 from containerd/dependabot/github_actions/a…
mxpv Feb 4, 2026
c51560a
Merge pull request #12850 from containerd/dependabot/github_actions/g…
mxpv Feb 4, 2026
fe90c3b
Merge pull request #12852 from containerd/dependabot/github_actions/d…
mxpv Feb 6, 2026
db9546b
cri: Fix image volumes with user namespaces
AutuSnow Jan 24, 2026
72d5139
Merge pull request #12819 from fuweid/followup-12714
fuweid Feb 6, 2026
b8a1501
Merge pull request #12847 from Champ-Goblem/fix/cri-withvolume-use-mo…
dmcgowan Feb 7, 2026
dbf7d64
Merge pull request #12841 from mxpv/fmt
dmcgowan Feb 7, 2026
8ad06b2
contrib/Dockerfile: remove proto3 (protobuf) stage
thaJeztah Feb 7, 2026
a6f03a7
apparmor: explicitly set abi/3.0
achernya Feb 6, 2026
1551986
update to go1.24.13, go1.25.7
thaJeztah Feb 7, 2026
3aac3ea
build(deps): bump github.com/checkpoint-restore/checkpointctl
dependabot[bot] Feb 7, 2026
d78273b
Merge pull request #12825 from containerd/dependabot/go_modules/githu…
fuweid Feb 8, 2026
10a5bad
Merge pull request #12869 from thaJeztah/bump_go
mxpv Feb 8, 2026
cb07cef
Merge pull request #12866 from thaJeztah/fix_contrib_dockerfile
mxpv Feb 8, 2026
bde439b
Merge pull request #12864 from achernya/fix-12726
mxpv Feb 8, 2026
6c1d54e
Merge pull request #12823 from containerd/dependabot/github_actions/a…
estesp Feb 9, 2026
4514f47
build(deps): bump the golang-x group with 2 updates
dependabot[bot] Feb 10, 2026
a46ab18
build(deps): bump github.com/klauspost/compress from 1.18.3 to 1.18.4
dependabot[bot] Feb 10, 2026
7505e76
build(deps): bump github/codeql-action from 4.32.1 to 4.32.2
dependabot[bot] Feb 10, 2026
d7dde86
Merge pull request #12880 from containerd/dependabot/github_actions/g…
estesp Feb 10, 2026
81ac9a8
Merge pull request #12816 from AutuSnow/fix-image-volume-userns
estesp Feb 10, 2026
30fe58a
Merge pull request #12878 from containerd/dependabot/go_modules/golan…
mxpv Feb 10, 2026
35871e0
Merge pull request #12879 from containerd/dependabot/go_modules/githu…
mxpv Feb 10, 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.24.13"
}
},

"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.24.13"
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.24.13"

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@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
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@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
with:
path: builds
- name: Create Release
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.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