Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2245 commits
Select commit Hold shift + click to select a range
e840d1d
Merge pull request #10286 from dmcgowan/update-tls-fallback-default-p…
Jun 11, 2024
87dd430
vendor: github.com/containerd/platforms v0.2.1
thaJeztah Jun 11, 2024
8bcffa9
KEP-3619: Fine grained SupplementalGroups control
everpeace Feb 2, 2024
09d3e20
Allow running test in usernamespace
siretart Jun 11, 2024
0de7043
Merge pull request #10322 from thaJeztah/bump_platforms
fuweid Jun 12, 2024
e4c61fd
Merge pull request #10319 from containerd/dependabot/go_modules/golan…
Jun 12, 2024
86b8a88
Remove pkg/seed
AkihiroSuda Jun 12, 2024
a60edaf
Merge pull request #10330 from AkihiroSuda/remove-pkg-seed
fuweid Jun 13, 2024
c75f6d4
Merge pull request #10323 from siretart/debian/bug.1044768
fuweid Jun 13, 2024
8c13ed1
Prepare v2.0.0-rc.3 release
dmcgowan Jun 13, 2024
3c09735
update runc binary to v1.1.13
thaJeztah Jun 13, 2024
cc2ceda
Revert "install-runc: pin Go to 1.21"
thaJeztah Jun 13, 2024
98ebb3e
Merge pull request #9737 from everpeace/kep-3169-SupplementalGroupsPo…
mikebrow Jun 13, 2024
5b8dfbd
Allow proxy plugins to have capabilities
Jun 6, 2024
0f76e35
added the openssf scorecard badge
harshitasao Jun 13, 2024
e49d3fd
Merge pull request #10334 from thaJeztah/bump_runc_1.1.13
AkihiroSuda Jun 13, 2024
e69ad94
build(deps): bump the k8s group across 1 directory with 4 updates
dependabot[bot] Jun 13, 2024
15887d7
sandbox: add update api for controller
abel-von Feb 28, 2024
e2e09b3
pkg/tracing: rename func that shadowed builtin, rm makeSpanName
thaJeztah Jun 14, 2024
4203e2d
pkg/tracing/plugin: rename var that collided with import
thaJeztah Jun 14, 2024
ccf7938
pkg/tracing: remove direct use of github.com/sirupsen/logrus
thaJeztah Jun 14, 2024
587ee80
pkg/tracing: LogrusHook.Fire: micro-optimisation
thaJeztah Jun 14, 2024
27de5fe
Merge pull request #10331 from dmcgowan/prepare-v2.0.0-rc.3
dmcgowan Jun 14, 2024
38e2f00
Adds a mutex to protect fallback host
dmcgowan Jun 14, 2024
4d48204
Merge pull request #10341 from thaJeztah/cleanup_traces
dmcgowan Jun 14, 2024
fe5f85c
Fix incorrect comment about ordering of parent layers
ambarve Jun 14, 2024
8f4a282
Merge pull request #10337 from Kern--/proxy-capabilities
Jun 14, 2024
ab61734
Merge pull request #10231 from jedevc/add-get-token-span
Jun 14, 2024
75fd7a5
pkg/shim: remove logrus imports
thaJeztah Jun 17, 2024
ea8265f
core/transfer/local: remove logrus import
thaJeztah Jun 17, 2024
ed64e65
core/mount: remove logrus import
thaJeztah Jun 17, 2024
0975ec0
Merge pull request #10342 from dmcgowan/add-mutex-fallback-host
fuweid Jun 17, 2024
4770618
Merge pull request #10349 from thaJeztah/less_logrus
dmcgowan Jun 17, 2024
e030f95
Merge pull request #10340 from containerd/dependabot/go_modules/k8s-e…
Jun 17, 2024
531da99
Reduce scope of permissions in stale workflow
dmcgowan Jun 17, 2024
f6f655c
build(deps): bump k8s.io/klog/v2 in the k8s group
dependabot[bot] Jun 18, 2024
becb2b2
build(deps): bump github.com/checkpoint-restore/checkpointctl
dependabot[bot] Jun 18, 2024
9edde81
build(deps): bump github.com/klauspost/compress from 1.17.8 to 1.17.9
dependabot[bot] Jun 18, 2024
741c4bd
Merge pull request #10350 from dmcgowan/gha-stale-permissions
fuweid Jun 18, 2024
027414e
enable ubuntu 24 runners
akhilerm May 13, 2024
624aa49
increase xfs base image size to 300Mb
akhilerm Jun 3, 2024
769e0c8
add debian sources for ubuntu-24
akhilerm Jun 12, 2024
1bfdcce
use vagrant from jammy in noble
akhilerm Jun 18, 2024
c25183f
use older version of OVMF package
akhilerm Jun 18, 2024
dd0542f
cmd: don't alias context package, and use cliContext for cli.Context
thaJeztah Jun 20, 2024
9077968
update release runners to ubuntu 24.04
akhilerm Jun 20, 2024
2f1bf79
Cleanup metadata godoc
dmcgowan Jun 20, 2024
cb38b1e
api: update github.com/containerd/ttrpc v1.2.5
thaJeztah Jun 19, 2024
b323e9e
vendor: github.com/containerd/ttrpc v1.2.5
thaJeztah Jun 20, 2024
d7836cf
Merge pull request #10370 from dmcgowan/metadata-godoc
Jun 20, 2024
8b5c218
Merge pull request #10369 from thaJeztah/cmd_no_alias
dmcgowan Jun 20, 2024
243b803
Add pprof to runc-shim
henry118 May 3, 2024
9a94e9e
Merge pull request #10372 from thaJeztah/bump_ttrpc_1.2.5
AkihiroSuda Jun 21, 2024
469f950
build(deps): bump github.com/containernetworking/cni from 1.2.0 to 1.2.1
dependabot[bot] Jun 21, 2024
14981b4
Merge pull request #10366 from thaJeztah/api_update_deps
estesp Jun 21, 2024
7310674
Merge pull request #10217 from akhilerm/ubuntu-24
dmcgowan Jun 24, 2024
7342272
Merge pull request #10351 from containerd/dependabot/go_modules/k8s-1…
Jun 24, 2024
2304cd9
build(deps): bump google.golang.org/protobuf from 1.34.1 to 1.34.2
dependabot[bot] Jun 24, 2024
c7f7fa5
Merge pull request #10352 from containerd/dependabot/go_modules/githu…
Jun 24, 2024
a2f9101
build(deps): bump github.com/containernetworking/plugins
dependabot[bot] Jun 24, 2024
2cf8237
build(deps): bump k8s.io/klog/v2 in the k8s group
dependabot[bot] Jun 24, 2024
7ec5b96
Merge pull request #10356 from containerd/dependabot/go_modules/githu…
estesp Jun 25, 2024
8f9607e
Use the transactor interface in metadata
dmcgowan Jun 25, 2024
14b053f
build(deps): bump github.com/containerd/go-cni from 1.1.9 to 1.1.10
dependabot[bot] Jun 25, 2024
c097022
build(deps): bump github.com/containernetworking/cni from 1.2.1 to 1.2.2
dependabot[bot] Jun 25, 2024
c673fcc
Merge pull request #10355 from containerd/dependabot/go_modules/googl…
estesp Jun 25, 2024
5ec7e10
Merge pull request #10242 from henry118/shim-pprof
estesp Jun 26, 2024
686c36b
Merge pull request #10385 from dmcgowan/metadata-transactor
Jun 26, 2024
8c39a5d
Merge pull request #10383 from containerd/dependabot/go_modules/githu…
Jun 26, 2024
cf2f42e
Merge pull request #10382 from containerd/dependabot/go_modules/githu…
Jun 26, 2024
faf06a3
Merge pull request #10381 from containerd/dependabot/go_modules/k8s-f…
Jun 26, 2024
017e10d
Merge pull request #10353 from containerd/dependabot/go_modules/githu…
Jun 26, 2024
7a0687f
Merge pull request #10354 from containerd/dependabot/go_modules/githu…
Jun 26, 2024
799bca9
pkg/reference: Spec.String(): use string-concatenation instead of spr…
thaJeztah Jun 27, 2024
74a6156
pkg/reference: SplitObject: zero allocations
thaJeztah Jun 27, 2024
4214595
pkg/reference: SplitObject: add proper GoDoc
thaJeztah Jun 27, 2024
a5fce38
pkg/reference: Spec.Digest(): inline SplitObject code
thaJeztah Jun 27, 2024
ae7d74b
Merge pull request #10393 from thaJeztah/improve_reference
Jun 27, 2024
fec33aa
pkg/reference: deprecate SplitObject
thaJeztah Jun 27, 2024
ef98c71
Implement fsverity functionality
Jenkins-J Jan 9, 2024
a723c0c
pkg/reference: remove deprecated SplitObject
thaJeztah Jun 28, 2024
10aec35
cri: ensure NRI API never has nil CRI
samuelkarp Jun 28, 2024
96352ad
update runhcs binary to v0.12.4
thaJeztah Jun 28, 2024
db1123b
Merge pull request #10394 from thaJeztah/deprecate_reference_SplitObject
AkihiroSuda Jun 29, 2024
7103e38
Merge pull request #10007 from Jenkins-J/fsverity-content-verification
AkihiroSuda Jun 29, 2024
f5f1165
Merge pull request #9903 from abel-von/add-update-resource-only
fuweid Jul 1, 2024
37e0f54
Merge pull request #10402 from thaJeztah/update_runhcs_v0.12.4
fuweid Jul 1, 2024
f6e731c
cri: get pid count from container metrics
linxiulei Jun 21, 2024
23170e2
Move fsverity package to internal
dmcgowan Jul 1, 2024
ebcbbe5
Merge pull request #10401 from samuelkarp/nri-panic
samuelkarp Jul 1, 2024
3b2a14b
Merge pull request #10407 from dmcgowan/fsverity-internal
fuweid Jul 1, 2024
1fb1882
Merge pull request #10375 from linxiulei/podstats
fuweid Jul 1, 2024
56495b4
update go version to 1.22.5
akhilerm Jul 3, 2024
1117f66
Merge pull request #10416 from akhilerm/update-go1.22.5
AkihiroSuda Jul 3, 2024
51f34ff
CI: update Fedora to 40
AkihiroSuda Jul 4, 2024
cbb2fc7
Merge pull request #10436 from AkihiroSuda/fedora-40
AkihiroSuda Jul 7, 2024
eaa1afe
Set stderr to empty string when using terminal on Windows.
TinaMor Jul 2, 2024
efd4415
client: fix tasks with PID 0 cannot be forced to delete
Iceber Jul 8, 2024
203cb30
script: bump up imgcrypt version to v1.2.0-rc1
ktock Jun 18, 2024
63b55e6
build(deps): bump the golang-x group with 2 updates
dependabot[bot] Jul 8, 2024
1b24e53
Merge pull request #10443 from containerd/dependabot/go_modules/golan…
Jul 9, 2024
89a2cac
scripts/critest.sh: Prepare for userns tests in runc
rata Jul 3, 2024
e1adfae
script/setup/config-containerd: Use slow_chown
rata Jul 4, 2024
300fd77
use typeurl funcs for marshalling anypb.Any
akhilerm Jul 8, 2024
0772d0a
Fix for `[cri] ttrpc: closed` during ListPodSandboxStats
dims Jul 3, 2024
7c4de28
Update cri-tools to v1.30.1
rata Jul 11, 2024
231301c
Merge pull request #10451 from dims/cri-ttrpc-closed-during-ListPodSa…
dmcgowan Jul 11, 2024
ac0f34f
Merge pull request #10378 from akhilerm/use-marshall-from-type-url
Jul 11, 2024
807f325
cri: optimize ListPodSandboxStats with parallelism
linxiulei Jun 22, 2024
274de35
updated the domain in the link
harshitasao Jul 12, 2024
edd84f4
Add read permission limit on link workflow
dmcgowan Jul 15, 2024
7480de2
Remove static link to images outside of the repository
dmcgowan Jul 15, 2024
42daab9
Merge pull request #10449 from rata/rata/userns-ci-fixes
dmcgowan Jul 15, 2024
0262714
Merge pull request #10412 from TinaMor/tinamor/dev
samuelkarp Jul 15, 2024
9315d59
build(deps): bump tags.cncf.io/container-device-interface
dependabot[bot] Jul 15, 2024
9eda0b7
build(deps): bump github.com/Microsoft/hcsshim from 0.12.4 to 0.12.5
dependabot[bot] Jul 15, 2024
67a0efc
Merge pull request #10460 from dmcgowan/update-link-gha-workflow
kzys Jul 16, 2024
ac818cb
Merge pull request #10465 from containerd/dependabot/go_modules/githu…
AkihiroSuda Jul 16, 2024
ca6a8a5
Merge pull request #10464 from containerd/dependabot/go_modules/tags.…
AkihiroSuda Jul 16, 2024
c8254df
Include filename in error
colinodell Jul 16, 2024
3e5e5b4
Merge pull request #10471 from colinodell/include-path-in-error
kzys Jul 16, 2024
b31d3fd
Merge pull request #10357 from ktock/script-setup-imgcrypt-version-1.…
kzys Jul 16, 2024
78d3e20
Merge pull request #10376 from linxiulei/concurrent_podstats
samuelkarp Jul 16, 2024
1a5c711
update documentation for content-flow
deitch May 10, 2024
da36556
Merge pull request #10203 from deitch/content-flow-with-snapshot-updates
samuelkarp Jul 17, 2024
a5be629
Vendor GRPC 1.64
mxpv May 21, 2024
63b4688
Use grpc.NewClient instead of deprecated ones
mxpv May 21, 2024
fb674f8
Add resolver workaround for error: name resolver error: produced zero…
mxpv May 21, 2024
08d6c93
vendor: github.com/moby/sys/mountinfo v0.7.2
thaJeztah Jul 19, 2024
95b429c
vendor: github.com/moby/sys/signal v0.7.1
thaJeztah Jul 19, 2024
1bfa7c8
vendor: github.com/moby/sys/symlink v0.3.0
thaJeztah Jul 19, 2024
a779449
vendor: github.com/moby/sys/sequential v0.6.0
thaJeztah Jul 19, 2024
b41bb6d
Avoid potential reallocs by pre-sizing some slices
dcantah Jul 19, 2024
f0aecaa
Fix TestNewBinaryIOCleanup failing with gotip
mauri870 Jun 15, 2024
eb56f15
Merge pull request #10487 from thaJeztah/bump_moby_sys
dmcgowan Jul 22, 2024
01a2b6f
Merge pull request #10250 from mxpv/grpc
Jul 22, 2024
1e3c35b
Merge pull request #10488 from dcantah/avoid-realloc
samuelkarp Jul 22, 2024
2d97134
build(deps): bump github.com/containerd/imgcrypt
dependabot[bot] Jul 22, 2024
bfb2a35
Merge pull request #10408 from containerd/dependabot/go_modules/githu…
estesp Jul 22, 2024
ee2c0d9
KEP-3619: implement features.supplemental_groups_policy in RuntimeStatus
everpeace Jul 2, 2024
81ef465
KEP-3619: update cri-api version
everpeace Jul 17, 2024
025d116
build(deps): bump github.com/containernetworking/cni from 1.2.2 to 1.2.3
dependabot[bot] Jul 22, 2024
6c6eac5
Merge pull request #10410 from everpeace/kep-3619-runtimestatus-featu…
AkihiroSuda Jul 23, 2024
0fe79b6
Merge pull request #10346 from mauri870/hotfix/gotip-test
estesp Jul 23, 2024
bc51d4b
build(deps): bump the otel group across 1 directory with 8 updates
dependabot[bot] Jul 23, 2024
abdb4fd
build(deps): bump the k8s group across 1 directory with 4 updates
dependabot[bot] Jul 23, 2024
323ba43
Merge pull request #10494 from containerd/dependabot/go_modules/githu…
AkihiroSuda Jul 23, 2024
87833dc
Merge pull request #10445 from containerd/dependabot/go_modules/otel-…
kzys Jul 23, 2024
442dadd
Merge pull request #10495 from containerd/dependabot/go_modules/k8s-9…
kzys Jul 23, 2024
c3bed76
Merge pull request #10343 from ambarve/fix_ordering_comment
kzys Jul 23, 2024
0dcc51a
introspection: regenerate UUID if state is empty
samuelkarp Jul 24, 2024
f990308
Merge pull request #10503 from samuelkarp/issue-10491
kzys Jul 25, 2024
f9146c0
deprecation: update warnings for CRI config fields
samuelkarp Jul 25, 2024
40a315b
vendor: github.com/moby/sys/user v0.2.0
thaJeztah Jul 25, 2024
8437c56
pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns
thaJeztah Jul 16, 2024
eddd90d
remove deprecated pkg/userns
thaJeztah Jul 26, 2024
762df8b
Merge pull request #10473 from thaJeztah/migrate_userns
AkihiroSuda Jul 26, 2024
7a1f6b2
Merge pull request #10509 from samuelkarp/pr-9966-follow-up
AkihiroSuda Jul 26, 2024
2ddd3db
Merge pull request #9858 from w13915984028/fixdebug
kzys Jul 26, 2024
71b5b34
build(deps): bump ossf/scorecard-action from 2.3.3 to 2.4.0
dependabot[bot] Jul 29, 2024
ad24ca9
build(deps): bump github.com/urfave/cli/v2 from 2.27.2 to 2.27.3
dependabot[bot] Jul 29, 2024
ea3e1d9
Merge pull request #10518 from containerd/dependabot/github_actions/o…
kzys Jul 30, 2024
c6cea95
Make `StopPodSandbox` RPC idempotent
saschagrunert Jul 30, 2024
a97b118
Make `StopContainer` RPC idempotent
saschagrunert Jul 30, 2024
4cfeb7b
core/metadata: migrate sandboxes bucket into v1
fuweid Jul 16, 2024
7bcc785
Merge pull request #10521 from saschagrunert/idempotence-ctr
Jul 30, 2024
fec24e2
Merge pull request #10520 from saschagrunert/cri
Jul 30, 2024
fae1118
Merge pull request #10519 from containerd/dependabot/go_modules/githu…
Jul 30, 2024
fd2a767
Merge pull request #10442 from Iceber/fix_ctr_delete_force
Jul 30, 2024
551ac06
Ensure /run/containerd is created with correct perms
etungsten Jul 30, 2024
babfebf
Merge pull request #10472 from fuweid/migrate-sandboxes-bucket
AkihiroSuda Jul 31, 2024
7a80448
Merge pull request #10516 from etungsten/ensure-state-dir-perms
estesp Jul 31, 2024
0e4f210
support to syncfs after pull by using diff plugin
ningmingxiao May 29, 2024
45d8917
Merge pull request #10284 from ningmingxiao/sync
fuweid Aug 5, 2024
c0cdcb3
Add spans to CRI runtime service and related client methods
swagatbora90 Nov 17, 2022
83c2696
Remove extra span created in the instrumented service layer
swagatbora90 Feb 23, 2023
d036988
docs/content-flow: fix code fence delimiter
katexochen Aug 5, 2024
7f707b5
Merge pull request #10547 from katexochen/code-flow-delim
Aug 5, 2024
6814cc3
build(deps): bump google-github-actions/upload-cloud-storage
dependabot[bot] Aug 5, 2024
267fac5
build(deps): bump the golang-x group with 3 updates
dependabot[bot] Aug 5, 2024
337d8c5
Update release job to generate artifacts attestation
vishalRGurrala Aug 3, 2024
fc1637d
Attest artifacts in release workflow
vishalRGurrala Aug 6, 2024
349d2b5
script/setup/install-runc: fix runc using incorrect version
thaJeztah Aug 6, 2024
10d4ee9
Merge pull request #10556 from thaJeztah/fix_runc_version
Aug 6, 2024
32c2d14
use ctx object from cliContext instead of a creating a new one
tariq1890 Aug 6, 2024
58cf6e2
Merge pull request #10551 from containerd/dependabot/go_modules/golan…
samuelkarp Aug 7, 2024
d59e8a8
ctr: shim state for secondary tasks
samuelkarp Aug 7, 2024
7d4da0c
ctr: shim state query for old shims
samuelkarp Aug 7, 2024
8ef73c5
Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
zhsj Aug 8, 2024
9776047
migrate to github.com/moby/sys/userns
thaJeztah Aug 8, 2024
ee86aba
Merge pull request #10563 from thaJeztah/migrate_userns
dmcgowan Aug 9, 2024
268ae7f
Merge pull request #10562 from zhsj/pidfd
dmcgowan Aug 9, 2024
a100b05
update to go1.22.6
thaJeztah Aug 9, 2024
0b02e0c
Merge pull request #7616 from swagatbora90/trace-cri-runtime
Aug 9, 2024
3c344bc
Merge pull request #10569 from thaJeztah/bump_go
Aug 9, 2024
6b04c9d
Merge pull request #10550 from containerd/dependabot/github_actions/g…
kzys Aug 9, 2024
1de84c2
build(deps): bump google-github-actions/upload-cloud-storage
dependabot[bot] Aug 12, 2024
6ed54e9
build(deps): bump golang.org/x/sys in the golang-x group
dependabot[bot] Aug 12, 2024
1127908
build(deps): bump k8s.io/cri-api in the k8s group
dependabot[bot] Aug 12, 2024
3f53e7a
build(deps): bump github.com/urfave/cli/v2 from 2.27.3 to 2.27.4
dependabot[bot] Aug 12, 2024
7403f91
Merge pull request #10560 from samuelkarp/ctr-shim-state
fuweid Aug 13, 2024
dd2a24c
Merge pull request #10557 from tariq1890/cli-ctx-add
fuweid Aug 13, 2024
eebc80d
Merge pull request #10585 from containerd/dependabot/go_modules/golan…
AkihiroSuda Aug 13, 2024
c878093
Merge pull request #10552 from containerd/dependabot/go_modules/k8s-c…
AkihiroSuda Aug 13, 2024
bd9aed6
Merge pull request #10586 from containerd/dependabot/go_modules/githu…
AkihiroSuda Aug 13, 2024
a406da9
Merge pull request #10584 from containerd/dependabot/github_actions/g…
AkihiroSuda Aug 13, 2024
fb8cd04
add go1.23.0
akhilerm Aug 11, 2024
20ee6de
update golangci-lint to v1.60.1
akhilerm Aug 14, 2024
f8e0753
remove windows check in linux_test file
akhilerm Aug 14, 2024
1027b31
ignore the static check when using anonymous struct in testing
akhilerm Aug 14, 2024
ebc4735
use format string when using printf like commands
akhilerm Aug 14, 2024
f5d5407
Merge pull request #10578 from akhilerm/test-gotip
AkihiroSuda Aug 14, 2024
4356837
docs: Update BUILDING.md
jjmaestro Aug 14, 2024
a3d84a1
docs: update for containerd v2
AkihiroSuda Jul 31, 2024
a922786
Merge pull request #10526 from AkihiroSuda/fix-10132
mikebrow Aug 15, 2024
919beb1
Merge pull request #10593 from jjmaestro/patch-1
AkihiroSuda Aug 15, 2024
9e2357f
docs: add k8s 1.31 to support matrix to RELEASES
akhilerm Aug 15, 2024
cd4e24e
script/setup/install-dev-tools: update protoc-gen-go-ttrpc to v1.2.5
thaJeztah Aug 16, 2024
66817fc
script/setup/install-dev-tools: include patch version in versions
thaJeztah Aug 16, 2024
219df0e
Merge pull request #10604 from thaJeztah/openssf_happiness
estesp Aug 16, 2024
704c94b
Merge pull request #10600 from akhilerm/update-support-matrix
estesp Aug 16, 2024
0ecaec4
Merge pull request #10338 from harshitasao/scorecard-badge
estesp Aug 16, 2024
93abc2f
Update hcsshim to v0.12.6
kiashok Aug 19, 2024
429085c
build(deps): bump google-github-actions/upload-cloud-storage
dependabot[bot] Aug 19, 2024
1bff3bf
build(deps): bump dario.cat/mergo from 1.0.0 to 1.0.1
dependabot[bot] Aug 19, 2024
e8104a4
Merge pull request #10613 from kiashok/update-hcsshim-12.6
fuweid Aug 20, 2024
021063c
build(deps): bump the k8s group with 5 updates
dependabot[bot] Aug 20, 2024
50b0618
Register local content plugin from separate package
dmcgowan Aug 21, 2024
7b948fa
Merge pull request #10618 from containerd/dependabot/go_modules/k8s-f…
AkihiroSuda Aug 23, 2024
1195b68
build(deps): bump github.com/prometheus/client_golang
dependabot[bot] Aug 23, 2024
35b0292
remove sha256-simd
djdongjin Aug 25, 2024
f97b02f
Merge pull request #10614 from containerd/dependabot/github_actions/g…
estesp Aug 26, 2024
2b6b961
Merge pull request #10635 from djdongjin/remove-sha256-simd
estesp Aug 26, 2024
dc8f875
Merge pull request #10631 from containerd/dependabot/go_modules/githu…
Aug 26, 2024
569a8d6
Merge pull request #10626 from dmcgowan/content-local-plugin
estesp Aug 26, 2024
6f1cbd1
Merge pull request #10615 from containerd/dependabot/go_modules/dario…
estesp Aug 26, 2024
a26a33c
Merge pull request #10543 from vishalRGurrala/feature/generate-attest…
dmcgowan Aug 26, 2024
4735098
build(deps): bump go.etcd.io/bbolt from 1.3.10 to 1.3.11
dependabot[bot] Aug 26, 2024
faaafd6
build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.2 to 2.2.3
dependabot[bot] Aug 26, 2024
a36d38f
Add mailmap entry for Michael Zappa
dmcgowan Aug 22, 2024
4ba502a
Update api vendor to latest tag
dmcgowan Aug 23, 2024
cdbfcc2
Prepare release notes for v2.0.0-rc.4
dmcgowan Aug 22, 2024
38a2095
Merge pull request #10639 from containerd/dependabot/go_modules/githu…
estesp Aug 27, 2024
9aa8de8
Merge pull request #10638 from containerd/dependabot/go_modules/go.et…
estesp Aug 27, 2024
fa5bf66
Merge pull request #10643 from dmcgowan/prepare-v2.0.0-rc.4
dmcgowan Aug 27, 2024
e93c6db
Port name sampler to containerd v2 (#7)
Fricounet Jul 18, 2024
f151897
Update CRI image service to pull using transfer service
fangn2 May 15, 2023
0fefea9
add registry opts for resolver and other test fixes
swagatbora90 Jul 16, 2024
d11d247
feat(tracing): propagate trace context
just1not2 Sep 17, 2024
2f18b44
[unpacker] Enrich unpack spans
Fricounet Oct 3, 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.
80 changes: 0 additions & 80 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.0"
}
},

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

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@v4
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@v4
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@v4
with:
path: builds
- name: Create Release
uses: softprops/action-gh-release@v2
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
14 changes: 6 additions & 8 deletions .github/workflows/build-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
azure_windows_image_id:
description: Windows image URN to deploy
required: true
default: MicrosoftWindowsServer:WindowsServer:2022-datacenter:20348.350.2111030009
default: MicrosoftWindowsServer:WindowsServer:2022-datacenter:latest
azure_vm_size:
description: Windows image builder VM size
required: true
Expand Down Expand Up @@ -41,14 +41,12 @@ jobs:
working-directory: src/github.com/containerd/containerd

steps:
- uses: actions/setup-go@v3
with:
go-version: "1.20.2"

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/github.com/containerd/containerd

- uses: ./src/github.com/containerd/containerd/.github/actions/install-go

- name: Set env
shell: bash
run: |
Expand All @@ -74,7 +72,7 @@ jobs:
echo "SSH_PUB_KEY=$(cat ~/.ssh/id_rsa.pub)" >> $GITHUB_ENV

- name: Azure Login
uses: azure/login@v1
uses: azure/login@v2
with:
creds: ${{ secrets.AZURE_CREDS }}

Expand Down Expand Up @@ -144,7 +142,7 @@ jobs:
scp -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.PUBLIC_IP }}:/Users/azureuser/.docker/key.pem $HOME/.docker/key.pem

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
Loading