dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-13 17:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,261 Commits 29 Branches 315 Tags
fc965444b1367b3e1c6ae3c968b2ca02ffeb37c2
Commit Graph

15261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fu Wei
fc965444b1 Merge pull request #11881 from djdongjin/fix-TestExportAndImportMultiLayer-flaky 
Fetch image with default platform only in TestExportAndImportMultiLayer
 2025-06-04 03:28:42 +00:00
Fu Wei
280c7c6fcf Merge pull request #11934 from erofs/erofs-snapshotter 
erofs-snapshotter: fix to work with wrapped errors
 2025-06-04 02:04:15 +00:00
Fu Wei
e1b3cfadfa Merge pull request #11915 from dmcgowan/fix-transfer-differ-selection 
Fix transfer differ selection
 2025-06-04 00:46:02 +00:00
Gao Xiang
a8658a7081 erofs-snapshotter: fix to work with wrapped errors 
Commit fb6dd2cf15 ("client:improve mount error message") changed
the return value into a wraped error message, which causes the
ENOTBLK check doesn't work.

Reported-by: Aadhar Agarwal <aadagarwal@microsoft.com>
Fixes: https://github.com/containerd/containerd/pull/11861
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2025-06-04 07:34:19 +08:00
Derek McGowan
4f7c69ae67 Update differ selection in transfer service to prefer default 
Currently the erofs differ will be chosen and cause pulls to fail with
not implemented errors.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-06-02 22:54:30 -07:00
Derek McGowan
21f0595b9b Add debug log when transfer returns not implemented 
Currently the error details are not included in the output error and
there is no log. One of the reasons a the transferer was skipped could
be do to a specific component which is not implemented (such as trying
to use erofs differ) or unsupported image (pulling schema1). This
information is useful to find a bad configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-06-02 22:50:00 -07:00
Derek McGowan
d9bb00578e Add more error details when unpack fails to extract 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-06-02 22:49:59 -07:00
Fu Wei
f482992fdc Merge pull request #11911 from dmcgowan/transfer-internal-interface 
Remove internal interface from unpacker interface
 2025-06-03 01:37:22 +00:00
Phil Estes
7b895bea33 Merge pull request #11914 from henry118/dedup 
Enable DuplicationSuppressor in transfer service
 2025-06-03 01:08:07 +00:00
Phil Estes
aa6cce6c07 Merge pull request #11878 from azr/fix-import-local-transfer-svc 
fix import for local transfer service
 2025-06-03 01:07:31 +00:00
Henry Wang
1282299751 Enable DuplicationSuppressor in transfer service 
Signed-off-by: Henry Wang <henwang@amazon.com>
 2025-05-29 22:28:43 +00:00
Derek McGowan
00edba6aa8 Remove internal interface from unpacker interface 
Avoid using internal interfaces for exported types and always prefer
using interfaces over structs to limit unused imports.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-05-28 14:23:24 -07:00
Adrien Delorme
77562a8e4a fix import for local transfer service 
Signed-off-by: Adrien Delorme <azr@users.noreply.github.com>
 2025-05-28 11:55:30 +02:00
Mike Brown
e393f41d20 Merge pull request #11823 from djdongjin/go-mod-1.24 
Bump up go version to 1.24 and cri-api to 0.33.0
 2025-05-27 20:43:13 +00:00
Maksym Pavlenko
f6724ac319 Merge pull request #11883 from dmcgowan/transfer-pull-image-desc 
Add descriptor to transfer pull image events
 2025-05-23 20:36:32 +00:00
Maksym Pavlenko
909a5882d1 Merge pull request #11813 from jokemanfire/panic 
fix(container_create): if sandboxConfig's metadata is nil will panic
 2025-05-23 20:36:09 +00:00
Derek McGowan
663fa9d92b Merge pull request #11888 from austinvazquez/fix-v2.1.0-release-link 
docs: fix v2.1.0 release link
 2025-05-24 05:15:56 +08:00
Austin Vazquez
ee85517b19 docs: fix v2.1.0 release link 
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
 2025-05-23 14:55:00 -06:00
Jin Dong
e57b9f751a dep: bump up k8s.io/cri-api to 0.33.0 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2025-05-23 19:37:02 +00:00
Jin Dong
a4dd2b8f2a go.mod: bump up go to 1.24.3 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2025-05-23 19:37:02 +00:00
Jin Dong
b9a29bdb99 ci: bump up go to 1.24.3 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2025-05-23 19:36:58 +00:00
Maksym Pavlenko
a60fd18ccd Merge pull request #11839 from vvoland/seccomp-6.13 
seccomp: kernel v6.13 (libseccomp v2.6.0)
 2025-05-23 19:07:50 +00:00
Derek McGowan
f6ae79a0b6 Merge pull request #11834 from austinvazquez/bump-golang-versions-05062025-in-ci 
ci: bump golang [1.23.9, 1.24.3] in build and release
 2025-05-23 16:56:39 +00:00
Akihiro Suda
b337c00d66 Merge pull request #11861 from ningmingxiao/mount_err_detail 
client:improve mount error message
 2025-05-22 04:28:56 +00:00
Derek McGowan
b03191abad Merge pull request #11874 from dmcgowan/symlink-override-breakout 
Add symlink breakout test for overriden path
 2025-05-22 00:20:05 +00:00
Derek McGowan
6e17198f07 Add descriptor to transfer pull image events 
Include the descriptor for the image target on image events.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-05-21 17:04:44 -07:00
Jin Dong
213337ce4e Fetch image with default platform only in TestExportAndImportMultiLayer 
`TestExportAndImportMultiLayer` has been very flaky due to upstream
registry throttling/unavailability. E.g.,

https://github.com/containerd/containerd/actions/runs/15168768477/job/42653479864

```shell
    log_hook.go:47: time="2025-05-21T17:42:37.345336659Z" level=debug msg="fetch failed" func=docker.dockerFetcher.open file="/home/runner/work/containerd/containerd/core/remotes/docker/fetcher.go:470" digest="sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840" error="unexpected status code https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840: 503 Service Unavailable" mediatype=application/vnd.docker.image.rootfs.foreign.diff.tar.gzip size=116254563 testcase=TestExportAndImportMultiLayer url="https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840"
```

Notice this test fetches all platform images which is
unnecessary I think. E.g., the 503 from mcr above caused Linux test failures.
This change should reduce requests to `mcr.microsoft.com`.

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
 2025-05-21 16:08:39 -04:00
Derek McGowan
aa9c17c692 Add symlink breakout test for overriden path 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-05-20 16:58:12 -07:00
Derek McGowan
83f2d22704 Merge pull request #11869 from containerd/dependabot/go_modules/github.com/emicklei/go-restful/v3-3.12.2 
build(deps): bump github.com/emicklei/go-restful/v3 from 3.11.0 to 3.12.2
 2025-05-20 17:17:50 +00:00
Akihiro Suda
f209a82ca9 Merge pull request #11860 from thaJeztah/oci_no_panic 
pkg/oci: prevent panic for some platform-specific options
 2025-05-20 16:53:38 +00:00
Derek McGowan
cada13298f Merge commit from fork 
Revert "perf(applyNaive): avoid walking the tree for each file in the…
 2025-05-21 01:49:57 +08:00
Derek McGowan
1c8c3db788 Merge pull request #11870 from containerd/dependabot/github_actions/github/codeql-action-3.28.18 
build(deps): bump github/codeql-action from 3.28.17 to 3.28.18
 2025-05-20 16:20:18 +00:00
dependabot[bot]
78e838c349 build(deps): bump github/codeql-action from 3.28.17 to 3.28.18 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.17 to 3.28.18.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](60168efe1c...ff0a06e83c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-05-19 23:38:19 +00:00
dependabot[bot]
b98b998363 build(deps): bump github.com/emicklei/go-restful/v3 
Bumps [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) from 3.11.0 to 3.12.2.
- [Release notes](https://github.com/emicklei/go-restful/releases)
- [Changelog](https://github.com/emicklei/go-restful/blob/v3/CHANGES.md)
- [Commits](https://github.com/emicklei/go-restful/compare/v3.11.0...v3.12.2)

---
updated-dependencies:
- dependency-name: github.com/emicklei/go-restful/v3
  dependency-version: 3.12.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-05-19 23:19:21 +00:00
Akihiro Suda
2c5e196567 Merge pull request #11865 from sylvainmouquet/patch-1 
docs(ansible): fix the folder in step1
 2025-05-17 13:47:37 +00:00
Akihiro Suda
460162e0a4 Merge pull request #11850 from akhilerm/update-runhcs 
ci: update runhcs to v0.13.0
 2025-05-17 12:55:16 +00:00
ningmingxiao
fb6dd2cf15 client:improve mount error message 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2025-05-17 09:57:04 +08:00
Sylvain MOUQUET
8be437ee8b docs(ansible): fix the folder 
Signed-off-by: Sylvain MOUQUET <sylvain.mouquet@gmail.com>
 2025-05-16 23:00:42 +02:00
Mike Brown
7a3397d1e9 Merge pull request #11795 from mikebrow/reducing-k8s-vendor-footprint-executils 
clones k8s util exec used by streaming code removing k8s util dependencies
 2025-05-15 18:34:27 +00:00
Samuel Karp
80ead0bf3d Merge pull request #11863 from mikebrow/follow-up-reducing-k8s-vendor-footprint-streaming 
follow-up changes discussed at end of review creating these packages
 2025-05-15 17:19:16 +00:00
Mike Brown
d498e690eb clones k8s util exec used by streaming code removing k8s util dependencies 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2025-05-15 16:34:09 +00:00
Mike Brown
6c0d36b24e follow-up changes discussed at end of review creating these packages 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2025-05-15 15:22:25 +00:00
Sebastiaan van Stijn
b0052d94a6 pkg/oci: prevent panic for some platform-specific options 
Some of these options are designed to be a no-op when used on a Spec
that doesn't match the platform for the option. However, if the given
plaform was not present, they would panic.

This patch:

- Adds an early-return for options that are only applied on a
  specific platform.
- Update the GoDoc for these functions to describe they're a
  no-op on other platforms.
- Adds some rudimentary unit-tests to verify their behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-15 00:44:45 +02:00
Mike Brown
30be5e1793 Merge pull request #11840 from mikebrow/reducing-k8s-vendor-footprint-streaming 
clones vendor of k8s.io/kubelet/pkg/cri/streaming
 2025-05-14 21:50:01 +00:00
Derek McGowan
fd520d705f Merge pull request #11851 from erofs/erofs-snapshotter 
erofs-snapshotter: a fix for native image support and a performance tip
 2025-05-14 04:44:27 +00:00
Gao Xiang
ee5ad982f3 docs/snapshotters/erofs.md: a tip for improved performance 
It's preferred to use `--sort=none` to avoid tar data twice due to
stricter data ordering.

Link: https://git.kernel.org/xiang/erofs-utils/c/e97530622872
Signed-off-by: Gao Xiang <xiang@kernel.org>
 2025-05-14 07:55:53 +08:00
Gao Xiang
5f2200b2c7 erofs-differ: fix EROFS native image support 
A dumb bug was just found after I worked out a usable native
converter [1], instead of relying on some prebuilt image..

[1] https://github.com/erofs/erofs-container-toolkit
Signed-off-by: Gao Xiang <xiang@kernel.org>
 2025-05-14 07:31:56 +08:00
Akhil Mohan
af24e463bc update runhcs to v0.13.0 
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
 2025-05-13 20:49:38 +05:30
Mike Brown
7063ee6597 clones vendor of k8s.io/kubelet/pkg/cri/streaming 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2025-05-13 09:10:19 +00:00
Maksym Pavlenko
58cd33307f Merge pull request #11838 from ningmingxiao/debug_exec_event 
cri:use debug level when receive exec process exited events
 2025-05-13 03:32:51 +00:00