dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-06 13:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,452 Commits 31 Branches 333 Tags
release/2.4
Commit Graph
1120 Commits
Author SHA1 Message Date
dependabot[bot] 72453b868c 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>
(cherry picked from commit c51faeab7e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-10-26 19:05:27 +01:00
Sebastiaan van Stijn fb7714f2f8 vendor: github.com/klauspost/compress v1.20.1 
full diff: https://github.com/klauspost/compress/compare/v1.20.0...v1.20.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-10-26 19:03:47 +01:00
Sebastiaan van Stijn f00dd7552e vendor: github.com/fxamacker/cbor/v2 v2.9.4 
update to the latest version, which fixes various potential panics.

full diff: https://github.com/fxamacker/cbor/compare/v2.9.1...v2.9.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-16 21:33:36 +00:00
Derek McGowanandSamuel Karp 484e5aba58 vendor: github.com/containerd/containerd/api v1.12.0-rc.1 
Co-authored-by: Samuel Karp <samuelkarp@google.com>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2026-09-14 22:08:42 -07:00
dependabot[bot] 353342cae6 build(deps): bump github.com/klauspost/compress from 1.19.2 to 1.20.0 
Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.19.2 to 1.20.0.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](https://github.com/klauspost/compress/compare/v1.19.2...v1.20.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-11 23:23:41 +00:00
Sebastiaan van Stijn 69269c635b vendor: github.com/containerd/nri v0.12.3 
full diff: https://github.com/containerd/nri/compare/v0.12.2...v0.12.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-10 08:41:52 +02:00
Derek McGowan 157bbc9720 Merge pull request #14095 from thaJeztah/urfave_v3 
migrate to github.com/urfave/cli/v3
 2026-09-10 06:00:17 +00:00
Fu Wei 51e8aeffe4 Merge pull request #14113 from fuweid/cache-exit-code-in-state-dir 
shim-runc-v2: record exit status in bundle
 2026-09-10 01:36:21 +00:00
Sebastiaan van Stijn f72829f36b migrate to github.com/urfave/cli/v3 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-10 01:14:31 +02:00
Fu Wei 1380d3f365 Merge pull request #14019 from thaJeztah/update_log 
vendor: github.com/containerd/log main, use log.Level consts for log-levels
 2026-09-09 14:20:26 +00:00
Sebastiaan van Stijn a77089ba8e vendor: github.com/containerd/log v0.2.0 
full diff: https://github.com/containerd/log/compare/v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-09 08:44:56 +02:00
Sebastiaan van Stijn f30398314f vendor: github.com/moby/sys/userns v0.2.1 
userns: fix user-namespace detection on OpenVZ, where namespace inode
numbers are virtualized.

full diff: https://github.com/moby/sys/compare/userns/v0.2.0...userns/v0.2.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-08 20:32:44 +02:00
Wei Fu 3264a09dff shim-runc-v2: record exit status in bundle 
The task plugin may send duplicate task events to a subscriber. The second
event is generated by the shim delete command and currently it doesn't know
when container exited and what its exit code is. So, it always returns 137
as exit code. It may leave subscribers unsure which event they should trust
(see https://github.com/containerd/containerd/issues/6429).

This patch stores exit status into bundle state dir. The bundle state dir
is recommended to be tmpfs. Ideally, the write syscall won't take too long.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2026-09-08 07:56:16 -04:00
Sebastiaan van Stijn 0c4981cc2e vendor: github.com/go-jose/go-jose/v4 v4.1.5 
Fixed security issues

- cipher/cbc_hmac: don't panic on empty ciphertext
- cipher/cbc_hmac: don't panic on invalid key
- json: limit stack depth
- jwt: reject out-of-range NumericDate values
- Check alg against pubkey curve during verify.
- Reject malformed Ed25519 JWKs
- jws: choose verification key per-signature

Changed

- Verify OpaqueSigner's Public() return is public
- jws: skip signature on ErrJWKSKidNotFound
- Handle JWE JSON without protected header
- jws: don't strip internal whitespace before parsing JSON
- jws: fewer calls to OpaqueSigner.Public()
- Return a specific error when parsing empty string
- Reject typed nil at Verify time

full diff: https://github.com/go-jose/go-jose/compare/v4.1.4...v4.1.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-05 02:53:19 +02:00
Derek McGowan c003f88b8d Merge pull request #14023 from thaJeztah/migrate_tracing_loghook 
pkg/tracing: deprecate Logrushook in favor of log/otel.Logrushook
 2026-09-05 00:07:02 +00:00
Fu Wei 927baef640 Merge pull request #14105 from mxpv/sandbox-update 
sandbox: wire Controller.Update through to the shim
 2026-09-04 21:42:40 +00:00
Maksym Pavlenko 40f84371c6 vendor: update containerd api 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-09-03 15:57:53 -07:00
Maksym Pavlenko 9ca93e5488 vendor: bump go-cni v1.1.14 and containernetworking/cni v1.3.1 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-09-03 13:30:53 -07:00
Fu Wei e8c36acf66 Merge pull request #13919 from containerd/dependabot/go_modules/github.com/google/certtostore-1.0.7 
build(deps): bump github.com/google/certtostore from 1.0.6 to 1.0.7
 2026-08-28 19:06:06 +00:00
Sebastiaan van Stijn 5333ee0952 vendor: github.com/docker/go-events v0.1.0 
full diff: https://github.com/docker/go-events/compare/e31b211e4f1c...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-28 19:28:34 +02:00
Sebastiaan van Stijn 20fed5179a pkg/tracing: deprecate Logrushook in favor of log/otel.Logrushook 
Migrate the hook to a separate moduile in the containerd/log repository,
as it's closely related to the logging utilities provided there, and
allows consumers to use the hook without a direct dependency on
containerd itself.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-28 16:25:12 +02:00
Derek McGowan d18d1b5913 Merge pull request #13883 from containerd/dependabot/go_modules/github.com/prometheus/client_golang-1.24.1 
build(deps): bump github.com/prometheus/client_golang from 1.24.0 to 1.24.1
 2026-08-27 23:21:46 +00:00
dependabot[bot] f07b18490b build(deps): bump github.com/google/certtostore from 1.0.6 to 1.0.7 
Bumps [github.com/google/certtostore](https://github.com/google/certtostore) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/google/certtostore/releases)
- [Commits](https://github.com/google/certtostore/compare/1.0.6...v1.0.7)

---
updated-dependencies:
- dependency-name: github.com/google/certtostore
  dependency-version: 1.0.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-27 21:44:08 +00:00
Mike Brown 52be09ef1c update kubernetes to v1.37.0 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2026-08-27 15:24:24 -05:00
dependabot[bot] 5e89a2c119 build(deps): bump github.com/prometheus/client_golang 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.24.0 to 1.24.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.24.0...v1.24.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-version: 1.24.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-26 20:02:11 +00:00
Derek McGowan 65b4eb916e vendor: use local api module and update vendored api 
Pull in the mount capabilities extension.

The api module is consumed as a published version, so a local replace
is required to build against the unreleased proto changes. The replace
is added by 'make protos' whenever api/next.txtpb changes. It must be
dropped and go.mod pinned to a released api version before this is
merged.

This also moves the root module's own github.com/sirupsen/logrus
requirement from v1.10.1 to v1.10.2, which is not an intended dependency
bump. The published api module (v1.12.0-beta.0) requires logrus v1.9.3,
so it does not affect the root's resolution; the local api/go.mod on
upstream main already requires v1.10.2, and once the replace substitutes
it in, MVS takes the higher of the two. Verified by running 'go mod tidy'
on a copy of this tree with the replace directive removed: the root
stays at v1.10.1. This reverts on its own once the replace above is
dropped.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2026-08-26 10:49:00 -07:00
Sebastiaan van Stijn b44bea515c vendor: github.com/docker/go-metrics v0.1.0 
- Add support for creating timers with custom histogram buckets.
- Update `github.com/prometheus/client_golang` to v1.20.5.
- Update the minimum supported Go version to Go 1.21.
- Improve HTTP handler instrumentation, including minor performance improvements and cleanup.
- Avoid mutating shared label maps when creating namespaces and metrics.
- Encapsulate the Prometheus collector used by `HTTPMetric`.
- Improve package and API documentation.
- Update `golang.org/x/sys` and other dependencies.

full diff: https://github.com/docker/go-metrics/compare/v0.0.1...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-26 14:41:03 +02:00
Sebastiaan van Stijn 704ca21342 vendor: github.com/containerd/go-runc v1.2.1 
full diff: https://github.com/containerd/go-runc/compare/v1.2.0...v1.2.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-25 20:20:26 +02:00
Maksym Pavlenko 301026e58c Merge pull request #14009 from containerd/dependabot/go_modules/github.com/checkpoint-restore/checkpointctl-1.6.0 
build(deps): bump github.com/checkpoint-restore/checkpointctl from 1.5.0 to 1.6.0
 2026-08-22 17:21:51 +00:00
Maksym Pavlenko 6974dd33cc Merge pull request #14008 from containerd/dependabot/go_modules/moby-sys-599fb6b3f3 
build(deps): bump github.com/moby/sys/userns from 0.1.0 to 0.2.0 in the moby-sys group
 2026-08-22 17:21:40 +00:00
dependabot[bot] 64f05273e3 build(deps): bump github.com/checkpoint-restore/checkpointctl 
Bumps [github.com/checkpoint-restore/checkpointctl](https://github.com/checkpoint-restore/checkpointctl) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/checkpoint-restore/checkpointctl/releases)
- [Commits](https://github.com/checkpoint-restore/checkpointctl/compare/v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/checkpoint-restore/checkpointctl
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-21 23:23:40 +00:00
dependabot[bot] 0880064dea build(deps): bump github.com/moby/sys/userns in the moby-sys group 
Bumps the moby-sys group with 1 update: [github.com/moby/sys/userns](https://github.com/moby/sys).


Updates `github.com/moby/sys/userns` from 0.1.0 to 0.2.0
- [Release notes](https://github.com/moby/sys/releases)
- [Commits](https://github.com/moby/sys/compare/user/v0.1.0...user/v0.2.0)

---
updated-dependencies:
- dependency-name: github.com/moby/sys/userns
  dependency-version: 0.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: moby-sys
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-21 23:23:18 +00:00
Maksym Pavlenko 10cf7114e6 Bump go-runc to 1.2.0 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-08-21 15:26:45 -07:00
Sebastiaan van Stijn f511928a11 vendor: github.com/sirupsen/logrus v1.10.1 
Notable changes:

- Add bidirectional `log/slog` integration with a Logrus hook and `slog.Handler`.
- Add minimal, composable logging interfaces for individual log levels.
- Fix reentrant logging deadlocks and improve concurrency safety around formatters, hooks, and entries.
- Fix generic `Log`, `Logf`, `Logln`, and `LogFn` methods unexpectedly panicking at `PanicLevel`.
- Allow `Entry.Caller` to be set explicitly and preserved across derived entries.
- Improve `TextFormatter` performance and reduce allocations significantly.
- Improve common Logger and Entry hot paths and caller-reporting performance.
- Update `TextFormatter` handling for `[]byte`, debug/trace colors, and Windows ANSI terminals.
- Raise the minimum supported Go version to Go 1.23.
- Deprecate `Entry.HasCaller` and `MutexWrap`.

release-notes: https://github.com/sirupsen/logrus/releases/tag/v1.10.0
full diff: https://github.com/sirupsen/logrus/compare/v1.9.4...v1.10.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-21 00:12:12 +02:00
Phil Estes 592fee376a Merge pull request #14001 from thaJeztah/bump_platforms 
vendor: github.com/containerd/platforms v1.0.0-rc.5
 2026-08-20 21:36:46 +00:00
Sebastiaan van Stijn 0d797891bb vendor: github.com/containerd/platforms v1.0.0-rc.5 
- Fix WS2022 compat on hosts past the latest LTSC

full diff: https://github.com/containerd/platforms/compare/v1.0.0-rc.4...v1.0.0-rc.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-20 22:42:25 +02:00
Sebastiaan van Stijn c351cf4682 vendor: github.com/stretchr/testify v1.12.1 
full diff: https://github.com/stretchr/testify/compare/v1.11.1...v1.12.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-20 00:39:26 +02:00
Maksym Pavlenko 41ec0ef3da Merge pull request #13962 from containerd/dependabot/go_modules/github.com/klauspost/compress-1.19.2 
build(deps): bump github.com/klauspost/compress from 1.19.1 to 1.19.2
 2026-08-19 19:02:51 +00:00
Maksym Pavlenko f1afc184b2 Merge pull request #13985 from thaJeztah/bump_hcsshim 
vendor: github.com/Microsoft/hcsshim v0.15.0-rc.4
 2026-08-19 19:01:43 +00:00
Eshaan Mathur 8c4ccd2984 build: bump github.com/containerd/nri 
Bump to v0.12.2 (containerd/nri#302) to pick up the new Container.image field exposed to NRI plugins (Image{name, digest, config_digest})

Signed-off-by: Eshaan Mathur <eshaanm25@gmail.com>
 2026-08-19 11:09:11 -05:00
Sebastiaan van Stijn 972ef71c84 vendor: github.com/Microsoft/hcsshim v0.15.0-rc.4 
full diff: https://github.com/microsoft/hcsshim/compare/v0.15.0-rc.3...v0.15.0-rc.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:35:58 +02:00
Sebastiaan van Stijn 444ecd0be0 vendor: github.com/go-logr/logr v1.4.4 
full diff: https://github.com/go-logr/logr/compare/v1.4.3...v1.4.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:29:00 +02:00
Sebastiaan van Stijn 26c040fb40 vendor: github.com/felixge/httpsnoop v1.1.0 
full diff: https://github.com/felixge/httpsnoop/compare/v1.0.4...v1.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:29:00 +02:00
dependabot[bot] da7420a420 build(deps): bump github.com/klauspost/compress from 1.19.1 to 1.19.2 
Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](https://github.com/klauspost/compress/compare/v1.19.1...v1.19.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-14 23:24:18 +00:00
Tianon Gravi e01c004cc6 Remove dependency on github.com/opencontainers/runtime-tools 
The direct use was two lines in `internal/cri/nri/nri_api_linux.go` -- constructing a `generate.Generator{Config: spec}` solely to satisfy the `nrigen.UnderlyingGenerator` interface defined in `containerd/nri`. Since that interface already exists, we just need an implementation. Add `spec_generator.go` in the same package, implementing `UnderlyingGenerator` directly on `*rspec.Spec` with no external dependencies beyond `runtime-spec`.

Assisted-By: "claude my eyes right out"
Signed-off-by: Tianon Gravi <tianon.gravi@docker.com>
 2026-08-05 16:58:50 -07:00
Maksym Pavlenko 49854964b2 Merge pull request #13395 from kolyshkin/selinux-1.15.0 
bump selinux to v1.15.1, use SetProcessKind
 2026-08-05 18:09:56 +00:00
Derek McGowan a272df5685 Update api version to v1.12.0-beta.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2026-08-04 19:43:54 -07:00
Maksym Pavlenko 288104923b Merge pull request #13862 from containerd/dependabot/go_modules/github.com/containerd/imgcrypt/v2-2.0.3 
build(deps): bump github.com/containerd/imgcrypt/v2 from 2.0.2 to 2.0.3
 2026-07-29 00:27:03 +00:00
Kir Kolyshkin ba3a464b8d bump oc/selinux to v1.15.1, use SetProcessKind 
Drop internal/cri/seutil/seutil.go in favor of direct call to newly
introduced selinux.SetProcessKind.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2026-07-28 16:23:54 -07:00
Kir Kolyshkin 4167499888 deps: bump oc/selinux to v1.14.1 
Switch away from deprecated functionality.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2026-07-28 16:23:54 -07:00