Commit Graph
17554 Commits
Author SHA1 Message Date
Maksym Pavlenko 2177d8d2ba Merge pull request #14505 from AkihiroSuda/fix-cgroup-v1-confusion
RELEASES.md: fix wording about cgroup v1 deprecation
2026-11-01 22:08:58 +00:00
Akihiro Suda d1805c2ab4 RELEASES.md: fix wording about cgroup v1 deprecation
The previous wording was confusing, at least to Claude Opus 5.5,
which said:

  At least one maintained branch will still support
  it [cgroup v1] after that [May 2029]

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2026-11-02 02:25:59 +09:00
Maksym Pavlenko aefce4e7cd Merge pull request #14108 from mxpv/labels
cri: allocate the pod SELinux label in the CRI layer instead of podsandbox
2026-10-31 07:23:42 +00:00
Maksym Pavlenko acd4b73056 Merge pull request #14475 from mxpv/rust-shim
Add Rust runc shim to CI
2026-10-31 06:57:25 +00:00
Derek McGowan df9406883d Merge pull request #14349 from ericcurtin/windows-support-afunix
sys, dialer: support AF_UNIX sockets on Windows
2026-10-30 13:29:40 -07:00
Maksym Pavlenko 8859265706 ci: install the Rust runc shim from crates.io
Install the pinned release of containerd-runc-shim with cargo install
instead of building the tip of rust-extensions' main, so the Rust legs
run a known shim that does not change underneath the PR. The build no
longer runs inside rust-extensions, whose rust-toolchain.toml used to
pick the toolchain, so pin one here instead.

Building the shim takes a minute or two per Rust leg, and its inputs
are fixed by the pinned crate version, toolchain and runner image, so
keep the installed binary in the actions cache keyed on those and only
run cargo install, and install the toolchain, when it is missing.

CRI only types runtime options for io.containerd.runc.v2, so the Rust
shim got generic options and SystemdCgroup never reached it. Configure
it as the runc runtime's binary through runtime_path instead.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-10-30 13:20:13 -07:00
Maksym Pavlenko e7b76482e2 cri: warn when a sandbox controller returns an SELinux label
CRI owns the pod SELinux label, so a label returned by the sandbox
controller is ignored. Log a warning when it differs from the one CRI
allocated.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-10-30 12:18:21 -07:00
Maksym Pavlenko e2eaea620c Merge pull request #14488 from fuweid/revert-12821
Revert "fix: propagate `context deadline exceeded` error properly"
2026-10-29 21:14:01 +00:00
Maksym Pavlenko ebd6802602 ci: skip the user namespace and checkpoint tests for the Rust shim
The Rust shim now sets up a PTY's stdin without blocking, so
TestContainerPTY runs again. The CRI suite had no way to leave tests
out; it takes a SKIP pattern now, like FOCUS, and the Rust legs use it
for the user namespace tests, which need idmapped mounts the shim does
not do yet. The checkpoint disable script is skipped for the Rust shim
as well: it has no Checkpoint RPC, so the script's second case, a
checkpoint that must succeed with enable_criu unset, cannot pass with
it. Its integration legs already run with -no-criu.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-10-29 12:11:04 -07:00
Wei Fu 61ddbd7219 Revert "fix: propagate context deadline exceeded error properly"
This reverts commit f078cebbd1.

Propagating State deadline errors causes Get to fail and List to omit
tasks when a shim is temporarily unresponsive, such as during slow
cleanup in Delete. A timeout does not mean the task no longer exists,
and omitting it makes container lifecycle management harder for clients
and CRI.

Restore the previous behavior of returning UNKNOWN on State timeouts,
so tasks remain visible and callers can reconcile their state.

Refs: https://github.com/containerd/containerd/pull/14380#pullrequestreview-5689176711

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-10-29 10:25:20 -04:00
Samuel Karp 842119a779 Merge pull request #14481 from mikebrow/remove-old-TODO-question
remove old TODO question- where is close run?
2026-10-28 23:57:23 +00:00
Fu Wei 6cff9a7320 Merge pull request #14380 from tahsinrahman/fix/shim-state-not-blocked-by-delete
runc-shim: don't block State on in-flight Delete
2026-10-28 21:13:25 +00:00
Mike Brown 161858e024 remove old TODO question- where is close run?
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2026-10-28 15:42:50 -05:00
Maksym Pavlenko 59753fa1f8 Add rust runc-shim to CI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-10-27 16:45:07 -07:00
Akihiro Suda 43aa4ea134 Merge pull request #14314 from ChengyuZhu6/handler-platform
cri: resolve runtime handlers for image pulls
2026-10-27 21:50:50 +00:00
Maksym Pavlenko c2b0636c68 Merge pull request #14457 from containerd/dependabot/go_modules/golang-x-1d423e97b0
build(deps): bump golang.org/x/mod from 0.41.0 to 0.42.0 in the golang-x group across 1 directory
2026-10-27 16:58:24 +00:00
Maksym Pavlenko 2c9aa5dce3 Merge pull request #14473 from vvoland/work-update
vendor: google.golang.org/grpc v1.85.0 (fix deadlock)
2026-10-27 16:56:56 +00:00
Maksym Pavlenko de4c2a3f92 Merge pull request #14468 from thaJeztah/no_grpctrace
Makefile: disable legacy gRPC tracing and remove obsolete urfave_cli_no_docs build tag
2026-10-27 16:10:10 +00:00
Paweł Gronowski 366d31b393 vendor: google.golang.org/grpc v1.85.0
full diff: https://github.com/grpc/grpc-go/compare/v1.84.0...v1.85.0

grpc-go v1.82.1 introduced a transport deadlock
With enough concurrent RPCs on one connection, the client and server
both stop reading while their writes block on a full socket.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2026-10-27 14:04:22 +01:00
Derek McGowan 0ee363c535 Merge pull request #14472 from mxpv/ci-runsc-sudo
ci: pass TEST_RUNTIME explicitly to the runsc critest
2026-10-26 22:58:40 +00:00
Maksym Pavlenko 40cfca5747 ci: pass TEST_RUNTIME explicitly to the runsc critest
The runsc job runs on ubuntu-latest, which is moving to Ubuntu 26.04,
whose sudo (sudo-rs) does not support -E ("preserving the entire
environment is not supported, '-E' is ignored"). critest.sh then fails
on the unset TEST_RUNTIME, the only variable the step did not pass
explicitly.

Pass it on the sudo command line with the others and drop -E.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-10-26 14:20:05 -07:00
Sebastiaan van Stijn a320f1cbb0 Makefile: remove obsolete urfave_cli_no_docs build tag
The `urfave_cli_no_docs` build tag was removed in urfave/cli v3, with doc
generation moved to a separate module.

Remove the obsolete tag and the special handling for gen-manpages, which is
no longer needed after the migration to v3.

updates f72829f36b.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-10-26 18:23:42 +01:00
Sebastiaan van Stijn 0c9fabe1fb Makefile: disable legacy gRPC tracing
Add the `grpcnotrace` build tag to exclude gRPC's legacy tracing integration
and reduce binary sizes.

This reduces the size of containerd by ~272 KiB, containerd-stress by ~448 KiB,
and ctr by ~512 KiB, saving ~1.2 MiB overall.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-10-26 18:23:42 +01:00
Maksym Pavlenko c0ed7418da Merge pull request #14458 from containerd/dependabot/go_modules/github.com/klauspost/compress-1.20.3
build(deps): bump github.com/klauspost/compress from 1.20.1 to 1.20.3
2026-10-26 17:15:56 +00:00
Maksym Pavlenko e8ff555fd8 Merge pull request #14459 from containerd/dependabot/github_actions/codeql-actions-1b1ce9824d
build(deps): bump the codeql-actions group with 3 updates
2026-10-26 17:14:46 +00:00
Maksym Pavlenko 6a05475e16 Merge pull request #14460 from containerd/dependabot/github_actions/ossf/scorecard-action-2.5.0
build(deps): bump ossf/scorecard-action from 2.4.3 to 2.5.0
2026-10-26 17:10:52 +00:00
dependabot[bot] b0a0a11ebb build(deps): bump golang.org/x/mod
Bumps the golang-x group with 1 update in the / directory: [golang.org/x/mod](https://github.com/golang/mod).


Updates `golang.org/x/mod` from 0.41.0 to 0.42.0
- [Commits](https://github.com/golang/mod/compare/v0.41.0...v0.42.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-version: 0.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-26 16:41:37 +00:00
Phil Estes 7cdee0c4ae Merge pull request #14453 from MikeZappa87/mzappa/nriversionbump
Update NRI to latest (0.12.5)
2026-10-26 16:02:29 +00:00
Michael Zappa c7c0149f96 update nri to latest
Signed-off-by: Michael Zappa <michael.zappa@gmail.com>
2026-10-26 08:12:33 -06:00
Davanum Srinivas cfb18c48f8 Merge pull request #14418 from dims/runc-static
script/setup/install-runc: build runc statically
2026-10-26 02:21:37 +00:00
Davanum Srinivas ef4b3a3314 script/setup/install-runc: build runc statically
The test tarball from test/build.sh is built on the kubekins image and
run on other distros. A dynamic runc built on Debian trixie needs
GLIBC_2.38 and fails on AL2023 (kubernetes/kubernetes#142987).

Build with `make static` like the runc release binaries. EL has no
libseccomp-static, so the Fedora/EL VMs keep the dynamic build via
RUNC_DYNAMIC=1.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2026-10-25 20:50:56 -04:00
dependabot[bot] 7f335b62ef build(deps): bump ossf/scorecard-action from 2.4.3 to 2.5.0
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.3 to 2.5.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/4eaacf0543bb3f2c246792bd56e8cdeffafb205a...fa7117db83c52d787ae5a89f350999701505d78e)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-23 23:26:52 +00:00
dependabot[bot] 89a7fe7aba build(deps): bump the codeql-actions group with 3 updates
Bumps the codeql-actions group with 3 updates: [github/codeql-action/init](https://github.com/github/codeql-action), [github/codeql-action/analyze](https://github.com/github/codeql-action) and [github/codeql-action/upload-sarif](https://github.com/github/codeql-action).


Updates `github/codeql-action/init` from 4.38.3 to 4.39.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/24c54180a607b1449ed407dd24f251e4e9147c8d...6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee)

Updates `github/codeql-action/analyze` from 4.38.3 to 4.39.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/24c54180a607b1449ed407dd24f251e4e9147c8d...6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee)

Updates `github/codeql-action/upload-sarif` from 4.38.3 to 4.39.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/24c54180a607b1449ed407dd24f251e4e9147c8d...6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee)

---
updated-dependencies:
- dependency-name: github/codeql-action/init
  dependency-version: 4.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: codeql-actions
- dependency-name: github/codeql-action/analyze
  dependency-version: 4.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: codeql-actions
- dependency-name: github/codeql-action/upload-sarif
  dependency-version: 4.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: codeql-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-23 23:26:07 +00:00
dependabot[bot] c51faeab7e build(deps): bump github.com/klauspost/compress from 1.20.1 to 1.20.3
Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.20.1 to 1.20.3.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](https://github.com/klauspost/compress/compare/v1.20.1...v1.20.3)

---
updated-dependencies:
- dependency-name: github.com/klauspost/compress
  dependency-version: 1.20.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-23 23:23:17 +00:00
Eric Curtin a2622c0a7a sys, dialer: leave non-Windows code unchanged
Only the Windows listener and dialer take the unix:// scheme.

Assisted-by: OpenCode (claude-sonnet-5-5)
Signed-off-by: Eric Curtin <eric.curtin@docker.com>
2026-10-23 16:36:17 +01:00
Maksym Pavlenko 57d315c6ec Merge pull request #14441 from thaJeztah/bump_runhcs
update runhcs to v0.15.0
2026-10-21 23:31:01 +00:00
Maksym Pavlenko fb2804ea70 Merge pull request #14360 from tonistiigi/auth-body-close-fix
remotes/docker: close request body when authorization fails
2026-10-21 22:46:03 +00:00
Sebastiaan van Stijn 8288858ef7 update runhcs to v0.15.0
full diff: https://github.com/microsoft/hcsshim/compare/v0.15.0-rc.4...v0.15.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-10-20 23:43:07 +02:00
Phil Estes 2c2a63f432 Merge pull request #14386 from jterry75/jterry75/update_microsoft_hcsshim_v0_15_0
Bump github.com/Microsoft/hcsshim to v0.15.0
2026-10-20 20:47:46 +00:00
Samuel Karp 82d0ef9573 Merge pull request #14439 from vvoland/update-go
Update to go1.27.3
2026-10-20 20:35:11 +00:00
Paweł Gronowski 9bacf37b79 Update to go1.27.3
This release includes 1 security fix following the security policy:

- crypto/x509: mitigation for security concerns with a specific Certificate Authority

  We're blocking trust in a small set of intermediate certificates due to specific security concerns around their operation.

  Verify will now filter out chains which contain these intermediates, preventing them from being returned to the caller.

  We highly recommend immediately upgrading to this release.

  This is CVE-2026-111943 and Go issue https://go.dev/issue/82345.

release notes: https://go.dev/doc/devel/release#go1.27.3

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2026-10-20 21:44:50 +02:00
Justin Terry 25768a4595 Bump github.com/Microsoft/hcsshim to v0.15.0
This change updates Microsoft/hcsshim to v0.15.0 and Microsoft/go-winio
to v0.6.4.

This moves containerd back to mainline and off of the internally tagged
release candidate versions.

Signed-off-by: Justin Terry <terryjustin@microsoft.com>
2026-10-20 12:13:11 -07:00
Samuel Karp 5284371f05 Merge pull request #14381 from thaJeztah/fix_copy_util
core/content: Copy: restore support for "-1" as unknown size
2026-10-20 00:19:30 +00:00
Fu Wei f0cd36b3ff Merge pull request #14391 from samuelkarp/cri-pull-progress-timestamp
cri: record pull progress on request events
2026-10-19 23:12:06 +00:00
Maksym Pavlenko 9585566e9e Merge pull request #14407 from containerd/dependabot/go_modules/github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus-1.1.1
build(deps): bump github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus from 1.1.0 to 1.1.1
2026-10-19 17:59:01 +00:00
dependabot[bot] 52ffb18ab6 build(deps): bump github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus
Bumps [github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus](https://github.com/grpc-ecosystem/go-grpc-middleware) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/grpc-ecosystem/go-grpc-middleware/releases)
- [Commits](https://github.com/grpc-ecosystem/go-grpc-middleware/compare/v1.1.0...providers/prometheus/v1.1.1)

---
updated-dependencies:
- dependency-name: github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus
  dependency-version: 1.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-19 11:33:53 -04:00
Phil Estes 3acdcb579b Merge pull request #14413 from mxpv/ci_fix
Fix flaky CI
2026-10-19 13:36:14 +00:00
Maksym Pavlenko b1ab012ef6 Merge pull request #14253 from ump45nose/docs/fix-dead-anchors
docs: fix broken anchors in BUILDING.md and README.md
2026-10-19 05:15:24 +00:00
Akihiro Suda 954541ee2d Merge pull request #14410 from containerd/dependabot/github_actions/actions/download-artifact-8.0.2
build(deps): bump actions/download-artifact from 8.0.1 to 8.0.2
2026-10-18 05:56:15 +00:00
Vincent b6442b8b18 docs: fix broken anchors in BUILDING.md and README.md
Signed-off-by: Vincent <1729065730@qq.com>
2026-10-18 10:11:41 +08:00