mirrors/containerd
0
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-10-28 09:35:10 +08:00
Code Activity
17,536 Commits 32 Branches 333 Tags
main
Commit Graph
1118 Commits
Author SHA1 Message Date
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
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
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
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
Michael Zappa c7c0149f96 update nri to latest 
Signed-off-by: Michael Zappa <michael.zappa@gmail.com>
 2026-10-26 08:12:33 -06: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
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
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
Maksym Pavlenko 83ad295b76 Merge pull request #14406 from containerd/dependabot/go_modules/golang-x-3d830008a2 
build(deps): bump the golang-x group with 2 updates
 2026-10-17 21:58:41 +00:00
dependabot[bot] 1c31fb7774 build(deps): bump github.com/prometheus/client_golang 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.25.0/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.24.1...v1.25.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-10-16 23:23:14 +00:00
dependabot[bot] 7e8cd7acdc build(deps): bump the golang-x group with 2 updates 
Bumps the golang-x group with 2 updates: [golang.org/x/mod](https://github.com/golang/mod) and [golang.org/x/sys](https://github.com/golang/sys).


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)

Updates `golang.org/x/sys` from 0.48.0 to 0.49.0
- [Commits](https://github.com/golang/sys/compare/v0.48.0...v0.49.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
- dependency-name: golang.org/x/sys
  dependency-version: 0.49.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-16 23:22:49 +00:00
Maksym Pavlenko eea1312638 Merge pull request #14254 from thaJeztah/bump_go_winio 
vendor: github.com/Microsoft/go-winio v0.6.3
 2026-10-16 21:43:19 +00:00
Sebastiaan van Stijn 819723a239 vendor: golang.org/x/net v0.60.0 
includes various security fixes also fixed in go1.27.2/go1.26.9

full diff: https://github.com/golang/net/compare/v0.58.0...v0.60.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-10-13 21:52:58 +02:00
Sebastiaan van Stijn b9ed50f4ea vendor: github.com/Microsoft/go-winio v0.6.3 
full diff: https://github.com/microsoft/go-winio/compare/ad3df93bed29...v0.6.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-10-10 15:20:59 +02:00
dependabot[bot] 97bc5f4235 build(deps): bump golang.org/x/sync 
Bumps the golang-x group with 1 update: [golang.org/x/sync](https://github.com/golang/sync).


Updates `golang.org/x/sync` from 0.23.0 to 0.24.0
- [Commits](https://github.com/golang/sync/compare/v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.24.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-09 23:57:33 +00:00
dependabot[bot] 278333782e build(deps): bump the k8s group with 4 updates 
Bumps the k8s group with 4 updates: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery), [k8s.io/client-go](https://github.com/kubernetes/client-go), [k8s.io/cri-client](https://github.com/kubernetes/cri-client) and [k8s.io/cri-streaming](https://github.com/kubernetes/cri-streaming).


Updates `k8s.io/apimachinery` from 0.37.0 to 0.37.1
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.37.0...v0.37.1)

Updates `k8s.io/client-go` from 0.37.0 to 0.37.1
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.37.0...v0.37.1)

Updates `k8s.io/cri-client` from 0.37.0 to 0.37.1
- [Commits](https://github.com/kubernetes/cri-client/compare/v0.37.0...v0.37.1)

Updates `k8s.io/cri-streaming` from 0.37.0 to 0.37.1
- [Commits](https://github.com/kubernetes/cri-streaming/compare/v0.37.0...v0.37.1)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/client-go
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/cri-client
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/cri-streaming
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-10-02 23:23:10 +00:00
Akihiro Suda 7c359a8cba go.mod: bump minimum Go version to 1.27.0 
Corresponds to the minimum version required by Kubernetes 1.38
https://github.com/kubernetes/cri-api/blob/v0.38.0-alpha.1/go.mod#L5

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2026-10-02 15:38:42 +09:00
Samuel Karp bb12c26a17 Merge pull request #14234 from containerd/dependabot/go_modules/k8s-809a0ec50e 
build(deps): bump the k8s group with 2 updates
 2026-09-28 17:04:41 +00:00
dependabot[bot] 0e335b8e68 build(deps): bump google.golang.org/grpc from 1.83.2 to 1.84.0 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.83.2 to 1.84.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.83.2...v1.84.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.84.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-25 23:23:26 +00:00
dependabot[bot] e18b2bf601 build(deps): bump the k8s group with 2 updates 
Bumps the k8s group with 2 updates: [k8s.io/cri-api](https://github.com/kubernetes/cri-api) and [k8s.io/streaming](https://github.com/kubernetes/streaming).


Updates `k8s.io/cri-api` from 0.37.0 to 0.37.1
- [Commits](https://github.com/kubernetes/cri-api/compare/v0.37.0...v0.37.1)

Updates `k8s.io/streaming` from 0.37.0 to 0.37.1
- [Commits](https://github.com/kubernetes/streaming/compare/v0.37.0...v0.37.1)

---
updated-dependencies:
- dependency-name: k8s.io/cri-api
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/streaming
  dependency-version: 0.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-25 23:22:53 +00:00
Maksym Pavlenko 49d1f53880 Merge pull request #14152 from containerd/dependabot/go_modules/github.com/prometheus/client_model-0.6.3 
build(deps): bump github.com/prometheus/client_model from 0.6.2 to 0.6.3
 2026-09-17 15:35:06 +00:00
Samuel Karp fe4ef048ad Merge pull request #14174 from thaJeztah/bump_cbor 
vendor: github.com/fxamacker/cbor/v2 v2.9.4
 2026-09-16 20:58:52 +00:00
Samuel Karp 647fafa847 Prepare release notes for v2.4.0 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2026-09-16 09:45:27 -07:00
Sebastiaan van Stijn 3ab1d3a161 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 15:09:52 +02: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
Samuel Karp ee41a78643 Merge pull request #14150 from containerd/dependabot/go_modules/golang-x-e7a3917753 
build(deps): bump the golang-x group with 4 updates
 2026-09-14 16:49:29 +00: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
dependabot[bot] e217a27048 build(deps): bump github.com/prometheus/client_model from 0.6.2 to 0.6.3 
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.6.2 to 0.6.3.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](https://github.com/prometheus/client_model/compare/v0.6.2...v0.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-11 23:23:23 +00:00
dependabot[bot] 75138b3fda build(deps): bump the golang-x group with 4 updates 
Bumps the golang-x group with 4 updates: [golang.org/x/mod](https://github.com/golang/mod), [golang.org/x/sync](https://github.com/golang/sync), [golang.org/x/sys](https://github.com/golang/sys) and [golang.org/x/time](https://github.com/golang/time).


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

Updates `golang.org/x/sync` from 0.22.0 to 0.23.0
- [Commits](https://github.com/golang/sync/compare/v0.22.0...v0.23.0)

Updates `golang.org/x/sys` from 0.47.0 to 0.48.0
- [Commits](https://github.com/golang/sys/compare/v0.47.0...v0.48.0)

Updates `golang.org/x/time` from 0.15.0 to 0.16.0
- [Commits](https://github.com/golang/time/compare/v0.15.0...v0.16.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-version: 0.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sync
  dependency-version: 0.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sys
  dependency-version: 0.48.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/time
  dependency-version: 0.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-11 23:23:05 +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
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 0ca704384f vendor: github.com/containerd/log/otel v0.1.0 
no diff: same code, but tagged

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-09 08:44:53 +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
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
Maksym Pavlenko a2d2eabba4 Merge pull request #14093 from thaJeztah/bump_crypto2 
vendor: golang.org/x/crypto v0.56.0
 2026-09-04 18:01:38 +00:00
Derek McGowan 4a60706376 Merge pull request #14109 from thaJeztah/bump_cdi 
vendor: tags.cncf.io/container-device-interface v1.1.1
 2026-09-04 17:25:06 +00:00
Sebastiaan van Stijn d1b8275dc2 vendor: tags.cncf.io/container-device-interface v1.1.1 
full diff: https://github.com/cncf-tags/container-device-interface/compare/73444d1f71f2...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-04 11:29:59 +02: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
Sebastiaan van Stijn 977cb4bb0a vendor: golang.org/x/crypto v0.56.0 
full diff: https://github.com/golang/crypto/compare/v0.55.0...v0.56.0

We have tagged version v0.56.0 of golang.org/x/crypto in
order to address the following security issues:
- ssh: prevent DoS on deadlocked established channel
  Previously, after a channel has been established, a
  malicious peer could send crafted messages that would
  deadlock the entire connection.
  Now, we handle all RFC 4254 channel messages; global
  requests are handled explicitly. Then, treat all other
  messages as a protocol error and tear the connection
  down instead of buffering and blocking.
  Thanks to Will Mortensen for reporting this issue.
  This is CVE-2026-56855 and Go issue https://go.dev/issue/81317.
- ssh: prevent DoS on deadlocked undecided channel
  Previously, a channel registered in the mux's chanList is
  not usable until it is established. A malicious peer was
  able flood the channel's incomingRequests, deadlocking the
  entire connection.
  Now, we add an atomic established state, set when a channel
  becomes usable. Until such a time, handlePacket drops every
  packet other than the open confirmation/failure, without
  blocking and without tearing down the connection.
  Thanks to Will Mortensen for reporting this issue.
  This is CVE-2026-78662 and Go issue https://go.dev/issue/81316.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-09-03 01:59:52 +02:00
Samuel Karp 716cbaf512 Merge pull request #13972 from thaJeztah/no_spew 
internal/cri/server: avoid debug log formatting for container spec
 2026-08-28 19:17:22 +00: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 30cd464708 internal/cri/server: avoid debug log formatting for container spec 
Only construct the debug log entry when debug logging is enabled, and
log the runtime spec as a structured field instead of formatting it with spew.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-28 20:01:10 +02: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
Phil Estes bb5988d3d1 Merge pull request #14058 from thaJeztah/bump_otels 
chore(deps): go.opentelemetry.io/otel v1.46.0, contrib v0.71.0
 2026-08-28 14:17:21 +00:00
Sebastiaan van Stijn ea60594619 vendor: tags.cncf.io/container-device-interface 73444d1f71f2 
full diff https://github.com/cncf-tags/container-device-interface/compare/04278701a635...73444d1f71f20b3e6ff785585ec7321c79c94912

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-28 15:27:36 +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