Skip to content
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.

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

[pull] main from containerd:main #56

Open
wants to merge 3,636 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3636 commits
Select commit Hold shift + click to select a range
a448047
Merge pull request #10699 from containerd/dependabot/go_modules/k8s-8…
AkihiroSuda Sep 19, 2024
d720510
Enable the selinux on cri test
wzshiming Sep 21, 2024
906c232
Merge pull request #10307 from henry118/uidmap
fuweid Sep 23, 2024
2ca3ff8
Merge pull request #10713 from wzshiming/enable-selinux-on-cri-test
samuelkarp Sep 23, 2024
519cbda
build(deps): bump github.com/klauspost/compress from 1.17.9 to 1.17.10
dependabot[bot] Sep 23, 2024
c75178d
build(deps): bump google.golang.org/grpc from 1.66.2 to 1.67.0
dependabot[bot] Sep 23, 2024
f7ca91f
build(deps): bump github.com/prometheus/client_golang
dependabot[bot] Sep 23, 2024
004f395
core/mount: Use MNT_DETACH for umount of tmp layers
rata Sep 23, 2024
f8d84ec
core/mount: Prevent accidental removal of rootfs files
rata Sep 23, 2024
30f2893
core/mount: Only remove dirs if unmount succeeded
rata Sep 24, 2024
83fe526
Merge pull request #10719 from containerd/dependabot/go_modules/githu…
mxpv Sep 26, 2024
0dc66da
Merge pull request #10718 from containerd/dependabot/go_modules/googl…
mxpv Sep 26, 2024
146a977
Move features section to a separate file
mxpv Sep 26, 2024
3df2cc1
Merge pull request #10717 from containerd/dependabot/go_modules/githu…
mxpv Sep 26, 2024
b529072
Add timestamp to PodSandboxStatusResponse for kubernetes Evented PLEG
zouyee Sep 27, 2024
db97449
Merge pull request #10730 from mxpv/features
mxpv Sep 27, 2024
b7b6b32
Add check for CNI plugins before tearing down pod network
sameersaeed Sep 26, 2024
86e0f52
Merge pull request #10740 from zouyee/event
mxpv Sep 28, 2024
ccb2a8d
[cri] use 'UserSpecifiedImage' to set the image-name annotation
Sep 29, 2024
363e50b
Merge pull request #10747 from lujinda/anno-image-user-specified
fuweid Sep 30, 2024
bc46460
Prepare release notes for v2.0.0-rc.5
dmcgowan Sep 30, 2024
03db11c
Merge pull request #10744 from sameersaeed/sandbox-cni-plugins
mxpv Sep 30, 2024
17d4a13
Propagate trace contexts to shims
cpuguy83 May 7, 2024
03e0e4c
Merge pull request #10186 from cpuguy83/propagate_traces_to_shim
mxpv Sep 30, 2024
78e39f7
build(deps): bump github.com/intel/goresctrl from 0.7.0 to 0.8.0
dependabot[bot] Sep 30, 2024
0d4e606
Update hcsshim to v0.12.7
kiashok Sep 25, 2024
05ee43a
Merge pull request #10752 from dmcgowan/prepare-v2.0.0-rc.5
dmcgowan Oct 1, 2024
11ffba3
shim: Do not depend on pkg/oci
cpuguy83 Oct 1, 2024
64d29eb
snapshots: core: Remove dependency on api types
cpuguy83 Oct 1, 2024
2123855
Add build tag to omit grpc
cpuguy83 Oct 1, 2024
4d65025
Merge pull request #10725 from kiashok/update-hcsshim-0.12.7
dmcgowan Oct 2, 2024
06dfa0c
Merge pull request #10754 from containerd/dependabot/go_modules/githu…
dmcgowan Oct 2, 2024
095131a
add use systemd cgroup e2e
lengrongfu Dec 5, 2023
01ca26f
Merge pull request #10757 from cpuguy83/shim_deps
mxpv Oct 2, 2024
6ffdabf
Makefile: fix shim tags overwritten
cpuguy83 Oct 2, 2024
24fe444
script/setup/install-runc: Add trap statement to clean up tmp files
GabyCT Oct 2, 2024
d7f8303
Fix the race condition during GC of snapshots when client retries
saketjajoo Sep 24, 2024
9c23fd7
Merge pull request #10760 from GabyCT/topic/runctrap
mxpv Oct 2, 2024
e1006c0
Merge pull request #10723 from saketjajoo/3787-race-condition-fix
samuelkarp Oct 2, 2024
b2681df
shim: Move ttrpc interceptors to plugins
cpuguy83 Oct 2, 2024
b85909c
shim: Move pprof server to plugin
cpuguy83 Oct 2, 2024
f1c70e8
Merge pull request #9470 from lengrongfu/feat/add-e2e-for-systemdcgroup
dmcgowan Oct 3, 2024
59ffbf4
Merge pull request #10761 from cpuguy83/shim_remove_nethttp
estesp Oct 3, 2024
e479431
core/runtime: Fix a typo in error message
coolljt0725 Oct 5, 2024
7b18098
Update runner images to macOS13
austinvazquez Oct 7, 2024
d2565d4
Merge pull request #10781 from austinvazquez/upgrade-macos-runner-image
estesp Oct 7, 2024
8701137
Merge pull request #10777 from coolljt0725/fix_typo
estesp Oct 7, 2024
46f5a0d
update to go1.23.2,go1.22.8
austinvazquez Oct 4, 2024
f0f1bfc
update runc binary to 1.1.15
samuelkarp Oct 7, 2024
9c42dd9
build(deps): bump google.golang.org/protobuf from 1.34.2 to 1.35.1
dependabot[bot] Oct 7, 2024
72126a9
update sample go test commands
arkinmodi Oct 8, 2024
ce648b5
Merge pull request #10787 from samuelkarp/runc-1.1.15
samuelkarp Oct 8, 2024
179b8d9
Merge pull request #10772 from austinvazquez/update-golang-1.23.2
AkihiroSuda Oct 8, 2024
6c4102f
Merge pull request #10790 from containerd/dependabot/go_modules/googl…
AkihiroSuda Oct 8, 2024
428df99
build(deps): bump google.golang.org/grpc from 1.67.0 to 1.67.1
dependabot[bot] Oct 8, 2024
2483108
Merge pull request #10791 from containerd/dependabot/go_modules/googl…
AkihiroSuda Oct 9, 2024
f89ed3c
build(deps): bump golang.org/x/sys in the golang-x group
dependabot[bot] Oct 9, 2024
ce7c473
Merge pull request #10788 from containerd/dependabot/go_modules/golan…
AkihiroSuda Oct 9, 2024
ee92168
Switch from actuated.dev to GH Action runners for arm64
estesp Oct 11, 2024
08037e7
Merge pull request #10821 from estesp/switch-arm-runners
AkihiroSuda Oct 11, 2024
e2daa20
Revert "use older version of OVMF package"
AkihiroSuda Oct 11, 2024
38beeb3
Revert "use vagrant from jammy in noble"
AkihiroSuda Oct 11, 2024
4d02217
CI: fix "Unable to find a source package for vagrant" error
AkihiroSuda Oct 11, 2024
1db0064
CI: install OVMF for Vagrant
AkihiroSuda Oct 11, 2024
61f91b9
Merge pull request #10817 from AkihiroSuda/fix-10816
AkihiroSuda Oct 12, 2024
c6d0890
metrics: Use UnmarshalTo instead of UnmarshalAny
Iceber Oct 11, 2024
b7c333c
Revert "update runc binary to 1.1.15"
samuelkarp Oct 15, 2024
36ae5f9
Merge pull request #10721 from rata/issue-10704
fuweid Oct 15, 2024
5d49f2e
Merge pull request #10838 from samuelkarp/revert-runc-1.1.15
fuweid Oct 15, 2024
bfe59da
build(deps): bump github.com/klauspost/compress from 1.17.10 to 1.17.11
dependabot[bot] Oct 15, 2024
c3d84a8
build(deps): bump the otel group with 8 updates
dependabot[bot] Oct 15, 2024
0742238
Handle teardown failure to avoid blocking cleanup
Matteo-Pulcini Oct 15, 2024
8b41368
Merge pull request #10830 from containerd/dependabot/go_modules/otel-…
AkihiroSuda Oct 16, 2024
5eb0be9
build(deps): bump github.com/urfave/cli/v2 from 2.27.4 to 2.27.5
dependabot[bot] Oct 16, 2024
bff82e1
[StepSecurity] ci: Harden GitHub Actions
step-security-bot Oct 16, 2024
37943cf
Merge pull request #10840 from step-security-bot/stepsecurity_remedia…
samuelkarp Oct 16, 2024
4bd3a71
go.{mod,sum}: update NRI deps and re-vendor.
klihub Oct 4, 2024
4f2bc15
build(deps): bump lycheeverse/lychee-action from 1.10.0 to 2.0.2
dependabot[bot] Oct 16, 2024
e4df672
sandbox: add sandbox controller v2
abel-von Feb 21, 2024
fc5086a
cri: remove sandbox controller from client
abel-von May 11, 2024
dac9419
Merge pull request #10829 from containerd/dependabot/github_actions/l…
estesp Oct 16, 2024
d1245c6
Merge pull request #10815 from Iceber/unmarshal-metrics-to-type
estesp Oct 16, 2024
0abada6
Merge pull request #10839 from matteopulcini6/sandbox-deferring-teard…
estesp Oct 16, 2024
b724b9f
Add containerd 2.0 doc
austinvazquez Sep 13, 2024
3bc51c4
Merge pull request #10696 from austinvazquez/add-containerd-2.0-doc
samuelkarp Oct 16, 2024
fff2236
Merge pull request #10769 from klihub/devel/update-nri
dmcgowan Oct 16, 2024
3a6e5fc
Merge pull request #10832 from containerd/dependabot/go_modules/githu…
AkihiroSuda Oct 17, 2024
6c386c3
Merge pull request #10656 from djdongjin/remove-cri-SandboxInfo-Runti…
AkihiroSuda Oct 17, 2024
f8d50f6
README.md: put a link to docs/containerd-2.0.md
AkihiroSuda Oct 17, 2024
3eea353
docs/containerd-2.0.md: mention the removal of `cri-containerd-*.tar.gz`
AkihiroSuda Oct 17, 2024
72e4db7
Merge pull request #9882 from abel-von/sandbox-controller-v2
AkihiroSuda Oct 17, 2024
7c7c3cf
Merge pull request #10833 from containerd/dependabot/go_modules/githu…
AkihiroSuda Oct 17, 2024
baf4a98
Merge pull request #10845 from AkihiroSuda/docs-2.0-2
estesp Oct 17, 2024
18e4ea9
Add After=dbus.service to containerd.service
benjaminp Oct 8, 2024
249dd74
Format link text in containerd 2.0 doc for readability
austinvazquez Oct 17, 2024
ec30475
Merge pull request #10849 from austinvazquez/align-containerd-2.0-doc…
dmcgowan Oct 17, 2024
ce265ff
Merge pull request #10798 from benjaminp/patch-1
dmcgowan Oct 17, 2024
347423a
Request 'allow' setgroups when spawning new userns
mbaynton Oct 17, 2024
a6ceb4b
containerd 2.0 guide: add image verifier plugins
samuelkarp Oct 17, 2024
963c216
Merge pull request #10741 from mbaynton/userns-allow-setgroups
samuelkarp Oct 17, 2024
943b196
Update NRI documentation for containerd 2.0
austinvazquez Oct 17, 2024
ffdbac0
Merge pull request #10850 from samuelkarp/containerd-2.0-guide
AkihiroSuda Oct 18, 2024
d4cabf7
Merge pull request #10852 from austinvazquez/update-nri-doc-for-2.0
AkihiroSuda Oct 18, 2024
92d327a
Update tracing docs for containerd 2.0
austinvazquez Oct 18, 2024
b291eb8
Merge pull request #10854 from austinvazquez/update-tracing-docs-for-…
dmcgowan Oct 18, 2024
2f24aa0
Update errdefs to 0.3.0
dmcgowan Oct 18, 2024
a21e379
Allow sections of Plugins to be merged, and not overwritten as entire…
rayburgemeestre Mar 21, 2024
530db2e
Introduce two additional unit tests for two runtimes and pod annotati…
rayburgemeestre Apr 2, 2024
f61dbc2
dedup ParseImageReferences
djdongjin Oct 21, 2024
269997a
dedup GetRepoDigestAndTag
djdongjin Oct 21, 2024
bc3ce87
Merge pull request #10856 from dmcgowan/update-errdefs-0.3.0
AkihiroSuda Oct 21, 2024
a5cd0d0
dedup GetPassthroughAnnotations
djdongjin Oct 21, 2024
38ba7f2
dedup BuildLabels
djdongjin Oct 21, 2024
bfe8fa3
build(deps): bump github/codeql-action from 3.24.0 to 3.26.13
dependabot[bot] Oct 21, 2024
78ec6ef
build(deps): bump actions/upload-artifact from 4.1.0 to 4.4.3
dependabot[bot] Oct 21, 2024
cf7218f
build(deps): bump actions/checkout from 4.1.1 to 4.2.1
dependabot[bot] Oct 21, 2024
03860c2
build(deps): bump azure/CLI from 1.0.9 to 2.1.0
dependabot[bot] Oct 21, 2024
cf9cf8b
build(deps): bump github.com/prometheus/client_golang
dependabot[bot] Oct 21, 2024
373311a
build(deps): bump github.com/opencontainers/selinux
dependabot[bot] Oct 21, 2024
0218959
Update hcsshim version to v0.12.8
kiashok Oct 21, 2024
a1ce188
CI: bump up crun to 1.17
AkihiroSuda Oct 22, 2024
3d6f2a0
Merge pull request #10866 from kiashok/update-hcsshim-0.12.8
AkihiroSuda Oct 22, 2024
6e85807
Merge pull request #10876 from containerd/dependabot/go_modules/githu…
dmcgowan Oct 22, 2024
d69e746
Merge pull request #10874 from containerd/dependabot/go_modules/githu…
dmcgowan Oct 22, 2024
8d641dd
Merge pull request #10871 from containerd/dependabot/github_actions/a…
dmcgowan Oct 22, 2024
ce3acc4
Merge pull request #10878 from AkihiroSuda/crun-1.17
mikebrow Oct 22, 2024
7663dba
Merge pull request #10869 from containerd/dependabot/github_actions/g…
dmcgowan Oct 22, 2024
1992917
Merge pull request #10870 from containerd/dependabot/github_actions/a…
AkihiroSuda Oct 22, 2024
1d98bad
Merge pull request #10872 from containerd/dependabot/github_actions/a…
AkihiroSuda Oct 22, 2024
c86b277
docs: update min version for deprecation warnings
samuelkarp Oct 22, 2024
18654db
Merge pull request #10881 from samuelkarp/containerd-2.0-guide
dmcgowan Oct 23, 2024
bc819bc
docs: add command for finding schema 1 images
samuelkarp Oct 23, 2024
e370f0e
Merge pull request #10882 from samuelkarp/containerd-2.0-guide
AkihiroSuda Oct 23, 2024
deccefc
Merge pull request #9982 from rayburgemeestre/merge-toml-configuratio…
AkihiroSuda Oct 23, 2024
2535b18
Scope writer locks to each writer.
n-g Oct 23, 2024
6517577
Merge pull request #10864 from djdongjin/dedup-cri-util
mxpv Oct 23, 2024
4b9d6c0
deps: bump github.com/containerd/nri
samuelkarp Oct 23, 2024
574f0da
Merge pull request #10884 from samuelkarp/nri-0.7.0
samuelkarp Oct 23, 2024
9aa637b
Update api vendor to latest
dmcgowan Oct 23, 2024
5c65a3d
Update version to v2.0.0-rc.6
dmcgowan Oct 23, 2024
b70cce2
Merge pull request #10887 from dmcgowan/prepare-v2.0.0-rc.6
AkihiroSuda Oct 24, 2024
d3ff3e2
CI: move crun from Ubuntu to Fedora
AkihiroSuda Oct 23, 2024
3a89e2e
Merge pull request #10883 from AkihiroSuda/crun
estesp Oct 24, 2024
8c98e18
Merge pull request #10867 from namespacelabs/main
dmcgowan Oct 24, 2024
778defa
Add back ZFS snapshotter
AkihiroSuda Oct 24, 2024
cf49b3d
Merge pull request #10892 from AkihiroSuda/fix-10889
dmcgowan Oct 24, 2024
5a2da17
Merge pull request #10793 from arkinmodi/fix-docs-execute-specific-test
mikebrow Oct 24, 2024
3cc2343
local: avoid writing to content root on readonly store
tonistiigi Oct 25, 2024
3b45a44
Update to ttrpc v1.2.6 tag
dmcgowan Oct 25, 2024
80e93b5
Merge pull request #10895 from dmcgowan/update-ttrpc-v1.2.6
AkihiroSuda Oct 25, 2024
96a1e49
Update containerd plugin to v1.0.0
dmcgowan Oct 25, 2024
cf86af6
Merge pull request #10896 from dmcgowan/update-plugin-1.0.0
AkihiroSuda Oct 25, 2024
700b906
resolver/docker: fix confusing "trying next host" log
thaJeztah Oct 23, 2024
fddeb6f
pkg/protobuf: fix typo in godoc
thaJeztah Oct 26, 2024
497dc7b
build(deps): bump github.com/checkpoint-restore/checkpointctl
dependabot[bot] Oct 28, 2024
a96eee7
Merge pull request #10899 from thaJeztah/fix_godoc_typo
AkihiroSuda Oct 28, 2024
1814910
build(deps): bump github.com/containerd/continuity from 0.4.3 to 0.4.4
dependabot[bot] Oct 28, 2024
588b7a1
testutil: avoid conflict with continuity/testutil
AkihiroSuda Oct 28, 2024
0208cb5
go.mod: github.com/containerd/imgcrypt v2.0.0-rc-1
AkihiroSuda Oct 28, 2024
0d59b84
Merge pull request #10900 from containerd/dependabot/go_modules/githu…
estesp Oct 28, 2024
e69a299
Merge pull request #10901 from containerd/dependabot/go_modules/githu…
estesp Oct 28, 2024
b831e3a
Merge pull request #10904 from AkihiroSuda/imgcrypt-v2
dmcgowan Oct 28, 2024
1e6fdb5
Merge pull request #10894 from tonistiigi/fix-readonly-contentstore
AkihiroSuda Oct 28, 2024
4b2bca0
config: migrate version before merging
AkihiroSuda Oct 28, 2024
9ed6e05
config: v1Migrate: support DisabledPlugins and RequiredPlugins
AkihiroSuda Oct 28, 2024
6b655d0
build(deps): bump github/codeql-action from 3.26.13 to 3.27.0
dependabot[bot] Oct 28, 2024
2789ba3
build(deps): bump actions/cache from 4.1.1 to 4.1.2
dependabot[bot] Oct 28, 2024
d257459
Merge pull request #10912 from containerd/dependabot/github_actions/a…
estesp Oct 29, 2024
7908923
build(deps): bump actions/checkout from 4.2.1 to 4.2.2
dependabot[bot] Oct 29, 2024
bfcab7b
Merge pull request #10910 from containerd/dependabot/github_actions/a…
mxpv Oct 30, 2024
3358f57
Merge pull request #10911 from containerd/dependabot/github_actions/g…
mxpv Oct 30, 2024
77d783e
Update hcsshim to v0.12.9
kiashok Oct 30, 2024
29ecab6
Merge pull request #10918 from kiashok/update-hcsshim-0.12.9
estesp Oct 30, 2024
4594f5c
services/snapshots: include name of snapshotter in debug logs
thaJeztah Oct 31, 2024
b6f4358
Merge pull request #10907 from AkihiroSuda/fix-10905
samuelkarp Oct 31, 2024
92b46e1
Merge pull request #10919 from thaJeztah/snapshot_logs_structured
mxpv Nov 1, 2024
a256f32
bump nri version to get PodIPs
aojea Nov 1, 2024
bc056a5
nri: report pod ips to the nri plugins
aojea Oct 24, 2024
bedd85a
RELEASES.md: k8s: fix CRI v1alpha2 removal release, remove old releases
AkihiroSuda Nov 1, 2024
f5ce859
docs/containerd-2.0.md: fix the deprecation release of AUFS
AkihiroSuda Nov 1, 2024
bf47b6e
docs/containerd-2.0.md: add more highlights
AkihiroSuda Nov 1, 2024
edb980a
update runc binary to 1.2.1
AkihiroSuda Nov 1, 2024
cb4ce9a
Merge pull request #10886 from thaJeztah/fix_retry_logs
samuelkarp Nov 1, 2024
ada2fa1
Merge pull request #10927 from AkihiroSuda/fix-removal-criv1alpha2
dmcgowan Nov 2, 2024
bddeba8
Make TestContainerPids more resilient
dmcgowan Nov 3, 2024
93f9db2
Update errdefs tag to v1.0.0
dmcgowan Nov 3, 2024
d389118
Prepare release notes for api/v1.8.0
dmcgowan Nov 3, 2024
481692a
Merge pull request #10926 from AkihiroSuda/docs-2.0
dmcgowan Nov 3, 2024
b6d1178
Merge pull request #10934 from dmcgowan/update-errdefs-1.0
AkihiroSuda Nov 3, 2024
716445a
Merge pull request #10933 from dmcgowan/test-container-resilience
fuweid Nov 3, 2024
c017828
Merge pull request #10877 from AkihiroSuda/runc-1.2.0
AkihiroSuda Nov 3, 2024
cf36acf
Merge pull request #10935 from dmcgowan/prepare-api-v1.8.0
dmcgowan Nov 4, 2024
33677d5
Update containerd API to v1.8.0 release
dmcgowan Nov 4, 2024
255d2a5
Merge pull request #10938 from dmcgowan/update-api-v1.8.0
estesp Nov 4, 2024
ae73e30
Disable vagrant strict dependency checking
dmcgowan Nov 4, 2024
c4f797e
Merge pull request #10950 from dmcgowan/vagrant-fix-dep-failure
dmcgowan Nov 5, 2024
bd10a60
Update platforms to v1.0.0-rc.0
dmcgowan Nov 4, 2024
bef201f
build(deps): bump google-github-actions/upload-cloud-storage
dependabot[bot] Nov 5, 2024
2d8fec4
go.mod: k8s.io/* v0.31.2
AkihiroSuda Nov 5, 2024
1edc214
build(deps): bump google-github-actions/auth from 2.1.6 to 2.1.7
dependabot[bot] Nov 5, 2024
37922af
Merge pull request #10942 from dmcgowan/update-platforms-v1-rc
dmcgowan Nov 5, 2024
21f6367
build(deps): bump github.com/containerd/typeurl/v2 from 2.2.0 to 2.2.1
dependabot[bot] Nov 5, 2024
edf367c
build(deps): bump github.com/containerd/nri from 0.7.0 to 0.8.0
dependabot[bot] Nov 5, 2024
3b976a1
Merge pull request #10951 from AkihiroSuda/k8s-0.31.2
AkihiroSuda Nov 5, 2024
a17001b
build(deps): bump github.com/fsnotify/fsnotify from 1.7.0 to 1.8.0
dependabot[bot] Nov 5, 2024
a43e7c1
build(deps): bump softprops/action-gh-release from 2.0.8 to 2.0.9
dependabot[bot] Nov 5, 2024
9fe6f7c
Merge pull request #10943 from containerd/dependabot/github_actions/g…
dmcgowan Nov 5, 2024
e841240
Merge pull request #10946 from containerd/dependabot/go_modules/githu…
dmcgowan Nov 5, 2024
71c274b
Merge pull request #10947 from containerd/dependabot/go_modules/githu…
dmcgowan Nov 5, 2024
545605d
Merge pull request #10945 from containerd/dependabot/github_actions/g…
dmcgowan Nov 5, 2024
18caa33
Merge pull request #10944 from containerd/dependabot/github_actions/s…
dmcgowan Nov 5, 2024
ff09b42
Update typeurl to v2.2.2
dmcgowan Nov 5, 2024
6369206
Merge pull request #10954 from dmcgowan/update-typeurl-2.2.2
samuelkarp Nov 5, 2024
f2da3fd
Update release docs for v2.0.0
dmcgowan Nov 4, 2024
03ba4ce
Update release notes for v2.0.0
dmcgowan Nov 4, 2024
207ad71
Merge pull request #10939 from dmcgowan/prepare-v2.0.0
dmcgowan Nov 5, 2024
5bfa36a
Merge pull request #10948 from containerd/dependabot/go_modules/githu…
mxpv Nov 7, 2024
1d6fdda
Merge pull request #10921 from aojea/nri_network
mxpv Nov 7, 2024
784116b
Avoid arch info in the sed/replace when building cri-cni-containerd.t…
dims Nov 7, 2024
a78a24e
Merge pull request #10964 from dims/Avoid-arch-info-in-the-sed/replac…
mikebrow Nov 7, 2024
bcc3cc9
update to go1.23.3 / go1.22.9
akhilerm Nov 7, 2024
ebda6bc
Merge pull request #10970 from akhilerm/golang1.23.3
mxpv Nov 7, 2024
8a8e50e
fsverity_test.go: fix nil pointer dereference, fix test fail
xbt573 Nov 8, 2024
f9537ae
fsverity_test.go: fix major/minor device number resolving
xbt573 Nov 8, 2024
0be529a
Merge pull request #10972 from xbt573/main
samuelkarp Nov 8, 2024
91e4e09
fsverity_linux.go: Fix fsverity.IsEnabled() for big endian systems
xbt573 Nov 10, 2024
d810c57
build(deps): bump softprops/action-gh-release from 2.0.9 to 2.1.0
dependabot[bot] Nov 11, 2024
d32ed4a
build(deps): bump actions/attest-build-provenance from 1.4.3 to 1.4.4
dependabot[bot] Nov 11, 2024
4bd3327
build(deps): bump github/codeql-action from 3.27.0 to 3.27.1
dependabot[bot] Nov 11, 2024
73ae1c6
build(deps): bump lycheeverse/lychee-action from 2.0.2 to 2.1.0
dependabot[bot] Nov 11, 2024
cebca6f
build(deps): bump the golang-x group with 3 updates
dependabot[bot] Nov 11, 2024
01c4891
build(deps): bump github.com/containerd/typeurl/v2 from 2.2.2 to 2.2.3
dependabot[bot] Nov 11, 2024
eb74521
Merge pull request #10986 from containerd/dependabot/github_actions/s…
dmcgowan Nov 12, 2024
9c925fb
Merge pull request #10987 from containerd/dependabot/github_actions/a…
dmcgowan Nov 12, 2024
6044bd0
Merge pull request #10992 from containerd/dependabot/go_modules/githu…
dmcgowan Nov 12, 2024
29c7b66
Merge pull request #10990 from containerd/dependabot/go_modules/golan…
estesp Nov 12, 2024
2cac8d5
Merge pull request #10988 from containerd/dependabot/github_actions/g…
estesp Nov 12, 2024
5509550
Merge pull request #10989 from containerd/dependabot/github_actions/l…
estesp Nov 12, 2024
9f8dfdc
Merge pull request #10981 from xbt573/main
estesp Nov 12, 2024
6c1b699
docs: update schema 1 deprecation information
samuelkarp Nov 13, 2024
013fe43
Merge pull request #11002 from samuelkarp/schema1-docs
dmcgowan Nov 13, 2024
1b01f39
Revert "Disable vagrant strict dependency checking"
akhilerm Nov 14, 2024
66f7290
Merge pull request #11004 from akhilerm/revert-vagrant-dependency-check
fuweid Nov 14, 2024
a457995
Merge pull request #11012 from dmcgowan/fix-migration-runtimeoptions
mxpv Nov 15, 2024
9c7a403
[containerd-stress] Use platform-specific default address
slonopotamus Nov 17, 2024
f8819df
Update install-imgcrypt to allow change install repo
jingxu97 Nov 18, 2024
9a7bc54
update runc binary to 1.2.2
austinvazquez Nov 18, 2024
0aa8b58
Merge pull request #11022 from austinvazquez/update-runc-1.2.2
dmcgowan Nov 18, 2024
50bdcb0
Merge pull request #11019 from jingxu97/patch-3
samuelkarp Nov 18, 2024
6b6f53c
Merge pull request #11016 from darwin-containers/stress-address
dmcgowan Nov 18, 2024
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.23.3"
}
},

"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"
]
}
33 changes: 33 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/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

script/setup/install-protobuf \
&& mkdir -p /go/src/usr/local/bin /go/src/usr/local/include \
&& mv /usr/local/bin/protoc /go/src/usr/local/bin/protoc \
&& mv /usr/local/include/google /go/src/usr/local/include/google

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

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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
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@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
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@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
path: builds
- name: Create Release
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.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/containerd-release-notes/release-notes.md
Loading