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
16,515 Commits 29 Branches 315 Tags
2005e01f068b656b2b3aecc4ed7bd0bcf59b6fe1
Commit Graph

16515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
2005e01f06 Run tests from api 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
0f55bdd49c Fix extensions API and update tests 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
58022a748a Parse log level when starting shim instance 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
d957b1bf53 Use log level instead of debug flag 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
31d0bbbad7 Include containerd version when launching shim 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
f71c2e4211 Reformat and clean proto files 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
b7ef291edc Provide bootstrap params when launching shims 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
acb8c8ea1e Update vendor 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
9e9a095feb Read spec annotations from file 
Revert changes related to reading annotations in runc v2 shim,
because this requires a special path for runc shim. This complicates
migration to the new bootstrap API.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
fa02acee20 Generate shim CLI flags under Command 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
fc8062f379 Rename CommandConfig field to better reflect their purpose 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
3831fc8063 Fix reading from stdin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
5ea993b48d Pass runc options as a separate extension 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
e72145b192 Update vendor 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
7f39b2d933 Update shim to support new bootstrap api 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Maksym Pavlenko
790b0ead7b Implement shim bootstrap protocol 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-08 08:29:28 -05:00
Derek McGowan
17cdec2981 Merge pull request #12206 from wjordan/push-namespace 
Add registry host namespace query parameter to mirror push requests
 2026-04-07 22:21:22 +00:00
Derek McGowan
6d11c84f72 Merge pull request #13158 from samuelkarp/revive-2.0 
releases: revive 2.0
 2026-04-07 18:38:30 +00:00
Maksym Pavlenko
e373060a95 Merge pull request #13157 from SergeyKanzhelev/forgottenRename 
replace one more k8s.io/apimachinery/ reference
 2026-04-06 17:36:16 +00:00
Phil Estes
9b9e505760 Merge pull request #13166 from tao12345666333/add-s390x-volume-test-images 
integration/images: add s390x builds for volume test images
 2026-04-06 07:57:07 +00:00
Sergey Kanzhelev
1615e07bb8 replace one more k8s.io/apimachinery/ reference 
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
 2026-04-06 06:16:21 +00:00
Jintao Zhang
72919fbd66 integration/images: add s390x builds for volume test images 
Ensure volume-copy-up and volume-ownership publish linux/s390x variants so integration tests can use these images on s390x without architecture-specific skips.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2026-04-06 01:31:34 +00:00
Fu Wei
86c36c6962 Merge pull request #12595 from tao12345666333/fix-binary-logging 
Fix binary logging driver not blocking container start on failure
 2026-04-05 23:13:04 +00:00
Jintao Zhang
cf772973cf process/io: ignore SIGTERM exit in cancel() to fix flaky test 
When cancel() sends SIGTERM to a short-lived logging binary that is
already mid-exit, cmd.Wait() may return 'signal: terminated'. This is
expected behavior since we sent the SIGTERM ourselves, so treat it as
a normal exit.

Fixes flaky TestNewBinaryIOBinaryV2Ready.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2026-04-05 13:41:54 +00:00
Jintao Zhang
22e6e1541c Add binary-v2 logging readiness scheme 
Expose log URI schemes in runtime v2 metadata

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2026-04-05 13:41:15 +00:00
Maksym Pavlenko
c586bec957 Merge pull request #13036 from cpuguy83/fix_data_digest 
content: use descriptor digest algorithm instead of assuming sha256
 2026-04-05 01:39:30 +00:00
Fu Wei
924f643b94 Merge pull request #13163 from mxpv/runtime-docs 
Move runtime v2 docs to ./docs
 2026-04-04 22:52:55 +00:00
Maksym Pavlenko
169e000389 Move runtime v2 docs to ./docs 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-04-04 14:10:29 -07:00
Maksym Pavlenko
78bcb44a34 Merge pull request #13132 from pierluigilenoci/fix/honor-stderrthreshold 
Honor stderrthreshold when logtostderr is enabled
 2026-04-04 16:10:11 +00:00
Fu Wei
38dafd778e Merge pull request #13155 from ningmingxiao/update_runc 
script/setup: update runc binary to v1.4.2
 2026-04-04 02:52:51 +00:00
Samuel Karp
a3ac81ff96 releases: revive 2.0 
Google Kubernetes Engine and Container-Optimized OS will use containerd
2.0 until March 2027.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2026-04-03 16:21:56 -07:00
Maksym Pavlenko
323d16fad8 Merge pull request #13156 from SergeyKanzhelev/pause3102 
pause image 3.10.1 -> 3.10.2 for add Windows Server 2025 (ltsc2025) s…
 2026-04-03 20:12:10 +00:00
Sergey Kanzhelev
05d3b31586 pause image 3.10.1 -> 3.10.2 for add Windows Server 2025 (ltsc2025) support 
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
 2026-04-03 16:17:39 +00:00
Pierluigi Lenoci
2a69c0d2c8 Honor stderrthreshold when logtostderr is enabled 
klog has a long-standing bug where setting -logtostderr=true causes the
-stderrthreshold flag to be silently ignored. All log messages are sent
to stderr regardless of their severity.

klog v2.140.0 introduced two new flags that allow callers to opt into the
correct behavior:

  -legacy_stderr_threshold_behavior=false
  -stderrthreshold=INFO

Set them in the CRI plugin's setGLogLevel() function, right after
klog.InitFlags() and before any other flag configuration.

Reference: kubernetes/klog#212
Signed-off-by: Pierluigi Lenoci <pierluigi.lenoci@gmail.com>
 2026-04-03 10:53:54 -05:00
Maksym Pavlenko
6c885467a4 Merge pull request #13076 from SergeyKanzhelev/useLatest136 
Use latest k8s 1.36
 2026-04-03 02:27:23 +00:00
ningmingxiao
143c566fcc update runc binary to v1.4.2 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2026-04-03 09:04:50 +08:00
Maksym Pavlenko
370010ae5b Merge pull request #13149 from ricardobranco777/skips390x 
Skip TestExportAndImportMultiLayer on s390x
 2026-04-02 17:59:09 +00:00
Ricardo Branco
2b7085767c Skip TestExportAndImportMultiLayer on s390x 
The test image ghcr.io/containerd/volume-copy-up:2.1 does not include
a manifest for s390x, causing the test to fail with:
"no manifest found for platform: not found".

Signed-off-by: Ricardo Branco <rbranco@suse.de>
 2026-04-02 18:46:20 +02:00
Maksym Pavlenko
1d9fd7e2c7 Merge pull request #13131 from fletcherw/nil-spec 
fix: handle nil spec for hostNetwork containers
 2026-04-02 02:14:35 +00:00
Fu Wei
1f0b0c442b Merge pull request #13091 from erofs/os_features 
Add `os.features` support for EROFS native container images
 2026-04-01 23:14:34 +00:00
Sergey Kanzhelev
1fc92e63dd switch from internal/cri/streamingserver to k8s.io/cri-streaming 
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
 2026-04-01 22:38:45 +00:00
Sergey Kanzhelev
1b67e78540 switch from k8s.io/apimachinery/pkg/util/httpstream to k8s.io/streaming/pkg/httpstream 
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
 2026-04-01 22:38:45 +00:00
Maksym Pavlenko
3a272ca5a1 Merge pull request #13141 from containerd/dependabot/github_actions/github/codeql-action-4.35.1 
build(deps): bump github/codeql-action from 4.33.0 to 4.35.1
 2026-04-01 20:14:26 +00:00
Maksym Pavlenko
c45c88624b Merge pull request #13142 from containerd/dependabot/go_modules/github.com/pelletier/go-toml/v2-2.3.0 
build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.4 to 2.3.0
 2026-04-01 20:12:56 +00:00
Gao Xiang
940076477e client/image: check if the snapshotter supports forcely if os.feature is set 
If no snapshotter is specified, container run selects the default
snapshotter.

However, if `os.features` is set, we should always call
`checkSnapshotterSupport()`.  This ensures containerd clients
report a clear error:

```
ctr: snapshotter overlayfs does not support platform
{amd64 linux  [erofs] } for image sha256:[]
```

instead of the confusing layer extraction error:

```
ctr: apply layer error for "": failed to extract layer sha256:[]:
failed to get stream processor for application/vnd.erofs.layer.v1:
no processor for media-type
```

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2026-04-01 13:18:27 +08:00
Gao Xiang
f8367b8ad2 client: remove toPlatforms() 
Just use apitypes.OCIPlatformFromProto().

Suggested-by: Jin Dong <djdongjin95@gmail.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2026-04-01 13:18:27 +08:00
Gao Xiang
cb93966b9f transfer: Default to the EROFS snapshotter and differ for EROFS images 
If no snapshotter is specified and `os.features` contains "erofs",
unpacking should use the EROFS snapshotter and differ.

This enhances the usability of native EROFS container images.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2026-04-01 13:18:23 +08:00
Gao Xiang
146930e91d api: add os_features to api/types/platform.proto 
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2026-04-01 13:13:11 +08:00
Gao Xiang
56a6fdbe5b Update github.com/containerd/platforms to v1.0.0-rc.4 
In order to support `os.features`.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
 2026-04-01 13:12:55 +08:00
Maksym Pavlenko
e78d26ee12 Merge pull request #12962 from containerd/dependabot/github_actions/actions/upload-artifact-7.0.0 
build(deps): bump actions/upload-artifact from 6.0.0 to 7.0.0
 2026-04-01 04:39:38 +00:00