dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-06 05:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,231 Commits 31 Branches 333 Tags
bb5988d3d1da170491bbb83564976729d85c227e
Commit Graph
1070 Commits
Author SHA1 Message Date
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
Sebastiaan van Stijn bfe115abe8 chore(deps): go.opentelemetry.io/otel v1.46.0, contrib v0.71.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-27 23:59:28 +02: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
Maksym Pavlenko 051118d229 Merge pull request #14036 from mxpv/shim-telemetry 
Pass tracing context from shim to runc and hooks
 2026-08-27 18:35:45 +00:00
Samuel Karp c2171cb918 Merge pull request #14042 from thaJeztah/bump_grpc 
vendor: google.golang.org/grpc v1.83.2
 2026-08-26 22:52:27 +00:00
Samuel Karp 33f2278e41 Merge pull request #14043 from thaJeztah/bump_cdi 
vendor: tags.cncf.io/container-device-interface 04278701a635
 2026-08-26 22:50:18 +00: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 89ba8063e1 vendor: google.golang.org/grpc v1.83.2 
contains a fix for [GHSA-2v4p-qf9q-27wj]

full diff: https://github.com/grpc/grpc-go/compare/v1.83.1...v1.83.2

[GHSA-2v4p-qf9q-27wj]: https://github.com/grpc/grpc-go/security/advisories/GHSA-2v4p-qf9q-27wj

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-26 17:44:53 +02:00
Sebastiaan van Stijn ab451b6de8 vendor: tags.cncf.io/container-device-interface 04278701a635 
Removes some dependencies, and fixes some concurrency issues.

full diff: https://github.com/cncf-tags/container-device-interface/compare/05ae4b5bb730...04278701a635abbf94c324d4de894c7cce41c2a4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-26 17:34:30 +02: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 beb23bc68d vendor: add go.opentelemetry.io/contrib/propagators/envcar v0.70.0 
The carrier implements the OpenTelemetry "Environment Variables as
Context Propagation Carriers" specification, which is how the shim hands
the trace context to the processes it spawns.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2026-08-25 10:52:02 -07: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
Maksym Pavlenko 34fc1fc473 Merge pull request #14007 from containerd/dependabot/go_modules/k8s-a7273d1033 
build(deps): bump the k8s group across 1 directory with 2 updates
 2026-08-22 17:21:19 +00:00
Fu Wei fd399bd7b8 Merge pull request #14006 from mxpv/gorunc 
Bump go-runc to 1.2.0
 2026-08-22 13:26:16 +00:00
dependabot[bot] b86bc4be52 build(deps): bump the k8s group across 1 directory with 2 updates 
Bumps the k8s group with 2 updates in the / directory: [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.36.3 to 0.36.4
- [Commits](https://github.com/kubernetes/cri-api/compare/v0.36.3...v0.36.4)

Updates `k8s.io/streaming` from 0.36.3 to 0.36.4
- [Commits](https://github.com/kubernetes/streaming/compare/v0.36.3...v0.36.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-08-22 00:37:04 +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 1448bcd8f0 vendor: tags.cncf.io/container-device-interface 05ae4b5bb730 
update to current main to remove some transitive dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-21 23:57:17 +02:00
Sebastiaan van Stijn 10e82fac8d internal/cri/server: remove remaining uses of k8s.io/utils 
k8s.io/utils/exec.CodeExitError was the only remaining direct use of
k8s.io/utils. Replace it with a local error type implementing the same
interface. The streaming server uses this interface to distinguish commands
terminating with a non-zero exit status from errors executing the
command, and to propagate the exit status to the client.

Add a FIXME to define this error contract in k8s.io/cri-streaming,
where it is consumed, instead of requiring runtime implementations
to implicitly match k8s.io/utils/exec.ExitError.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-21 11:14:53 +02: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 6e6518a155 vendor: go.opentelemetry.io/otel v1.45.0, go.opentelemetry.io/contrib v0.70.0 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:35:58 +02:00
Sebastiaan van Stijn 9023b7eb12 vendor: google.golang.org/protobuf v1.36.12 
full diff: https://github.com/protocolbuffers/protobuf-go/compare/f2248ac996af...v1.36.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:35:50 +02:00
Sebastiaan van Stijn ee2255275b vendor: google.golang.org/genproto/* 6ac0973c030d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:34:35 +02:00
Sebastiaan van Stijn 389f75a955 vendor: google.golang.org/grpc v1.83.1 
full diff: https://github.com/grpc/grpc-go/compare/v1.82.1...v1.83.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:34:28 +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
Sebastiaan van Stijn d1df90fb51 vendor: golang.org/x/mod v0.40.0 
full diff: https://github.com/golang/mod/compare/v0.39.0...v0.40.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:28:24 +02:00
Sebastiaan van Stijn e994dd627a vendor: golang.org/x/net v0.58.0 
full diff: https://github.com/golang/net/compare/v0.57.0...v0.58.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:27:25 +02:00
Sebastiaan van Stijn 4fb52e086c vendor: golang.org/x/crypto v0.55.0 
full diff: https://github.com/golang/crypto/compare/v0.53.0...v0.55.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:26:43 +02:00
Sebastiaan van Stijn 99178d1e2e vendor: golang.org/x/text v0.41.0 
full diff: https://github.com/golang/text/compare/v0.38.0...v0.41.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:25:55 +02:00
Sebastiaan van Stijn f6b36c43af vendor: golang.org/x/mod v0.39.0 
full diff: https://github.com/golang/mod/compare/v0.38.0...v0.39.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-08-19 15:25:09 +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
Paweł Gronowski b665fde220 Update Go to 1.26.6 
This release includes 10 security fixes covering module checksum
verification, denial-of-service protections, parser crashes, XSS, and
IDNA hostname validation, most notably:

- CVE-2026-56865: prevent malicious GOPROXY servers from bypassing sumdb transparency-log verification: https://go.dev/issue/80744
- CVE-2026-56864: prevent malicious GOSUMDB servers from serving unauthenticated module content: https://go.dev/issue/80745
- CVE-2026-56859: add recursion limits for XML decoding: https://go.dev/issue/80481
- CVE-2026-56853: apply ReadHeaderTimeout during unencrypted HTTP/2 detection: https://go.dev/issue/80205
- CVE-2026-56860: prevent quadratic behavior in URL path resolution: https://go.dev/issue/80494
- CVE-2026-46600: prevent panics when parsing malformed SVCB/HTTPS DNS records: https://go.dev/issue/79795
- CVE-2026-56862: limit excessive TLS post-handshake messages: https://go.dev/issue/80528
- CVE-2026-56858: fix JavaScript regexp context tracking in html/template: https://go.dev/issue/80435
- CVE-2026-39821: reject invalid ASCII-only Punycode labels: https://go.dev/issue/78760
- CVE-2026-33818: add recursion limits for ASN.1 unmarshalling: https://go.dev/issue/80405

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2026-08-13 22:13:25 +02: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