Commit Graph

16702 Commits

Author SHA1 Message Date
Akihiro Suda
ef985f8628 server: tolerate failed gRPC plugins when starting listeners
The grpc, grpc-tcp, and ttrpc server plugins enumerated their services
through ic.GetByType, which short-circuits on the first plugin whose
Instance() returned an error. A single failed gRPC plugin (e.g. CRI
under rootless, which cannot watch /etc/cni/net.d) therefore prevented
the server plugins from initialising, leaving /run/containerd/containerd.sock
uncreated.

Iterate the plugin set directly and skip plugins that failed to
initialise, restoring the pre-c15ec2485 behaviour where the listener
is still created and only the failed services are missing.

Fixes: c15ec2485 ("Add server plugins for grpc and ttrpc")
Fixes: https://github.com/containerd/containerd/issues/13362

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2026-05-10 14:02:25 +09:00
Derek McGowan
2976f38ccb Merge pull request #13325 from dmcgowan/prepare-v2.3.0
Prepare release notes for v2.3.0
v2.3.0
2026-04-30 18:30:03 +00:00
Derek McGowan
77eeb2d8ea Prepare release notes for v2.3.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-29 23:06:20 -07:00
Derek McGowan
c55ada3f31 Update api to v1.11.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-29 23:06:20 -07:00
Derek McGowan
ebf4404e39 Update release document
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-29 23:06:19 -07:00
Fu Wei
f49640ec1f Merge pull request #13321 from dmcgowan/remove-erofs-fsmerge-threshold
erofs: remove fsmerge threshold from snapshotter
api/v1.11.0
2026-04-30 03:00:06 +00:00
Derek McGowan
e3d5fe82b1 Merge pull request #13322 from dmcgowan/prepare-api-v1.11.0
Prepare release notes for api/v1.11.0
2026-04-30 02:54:27 +00:00
Derek McGowan
ee17fa1236 Merge pull request #13317 from fuweid/fix-merge-issue
config: preserve legacy grpc address across sparse imports
2026-04-30 01:17:55 +00:00
Derek McGowan
b7f8c3510d erofs: remove fsmerge threshold from snapshotter
Currently the metadata may be generated after a snapshot is committed,
causing a difference in the overlayfs mount that may cause ESTALE errors.
The committed snapshot must be immutable and should always return the
same set of mounts after commit, even if configuration is changed.

This setting may be added back later to be performed before commit,
either as part of the unpack or as a step before commit. This is getting
pulled out from the upcoming release.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-29 16:26:45 -07:00
Derek McGowan
8f2fce4ce5 Prepare release notes for v1.11.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-29 15:56:15 -07:00
Maksym Pavlenko
ce2955c7ce Merge pull request #13319 from mxpv/depr
Deprecate shim.Command
2026-04-29 22:19:42 +00:00
Samuel Karp
90dd71c037 Merge pull request #13318 from samuelkarp/mailmap
mailmap: update for 2.3.0 release
2026-04-29 19:04:24 +00:00
Samuel Karp
6bd8288f7b mailmap: update for 2.3.0 release
Assisted-by: gemini-cli
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2026-04-29 11:21:33 -07:00
Maksym Pavlenko
3e0ebf0f6d Deprecate shim.Command
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-04-29 10:51:55 -07:00
Wei Fu
ac77917b2f config: preserve legacy grpc address across sparse imports
When migrating v3 [grpc] config to the v4 server plugin config, only
emit fields that were actually set in the legacy config. This prevents
a sparse imported [grpc] section, such as one only setting
max_send_message_size, from generating address = "" and overwriting the
address migrated from the root config.

Add table-driven coverage for sparse legacy grpc imports, including
address preservation, imported address override, and default address
retention when no imported config specifies address.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-04-29 13:13:33 -04:00
Derek McGowan
1d7b73d54a Merge pull request #13315 from dmcgowan/update-containerd-dependencies
Update containerd core dependencies
v2.3.0-rc.1
2026-04-29 00:04:47 -07:00
Maksym Pavlenko
d2d057531d Merge pull request #13313 from mxpv/docs
Move remote-snapshotter.md to docs/snapshotters
2026-04-29 02:42:03 +00:00
Samuel Karp
5ba1172d29 Merge pull request #13050 from chrishenzie/prototype/nri-metrics
Implement NRI metrics adaptation layer
2026-04-29 00:56:58 +00:00
Derek McGowan
c5ea950ef6 Update continuity to v0.5.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-28 17:56:34 -07:00
Derek McGowan
0bd6e54cae Update to api v1.11.0-rc.0
No changes, just rc tag

Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-28 17:51:05 -07:00
Derek McGowan
1dd95ac390 Update plugin with optimizations that improve startup time
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-28 17:28:45 -07:00
Maksym Pavlenko
20ee263ff7 Merge pull request #13231 from containerd/dependabot/go_modules/otel-6f3ef841a9
build(deps): bump the otel group across 1 directory with 2 updates
2026-04-28 23:47:32 +00:00
Chris Henzie
5e907d7777 Implement NRI metrics adaptation layer
Add metrics for NRI plugin invocations, latency, adjustments, and active
count. Map NRI Metrics adaptation layer to containerd's Prometheus
metrics system via docker/go-metrics for observability.

Categorize plugin invocation errors into `deadline_exceeded`,
`canceled`, and dynamic gRPC status code dimensions to assist
troubleshooting.

Assisted-by: Antigravity
Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
2026-04-28 16:04:03 -07:00
Samuel Karp
bc69a52680 Merge pull request #13167 from lauralorenz/10681-ctr-image-export-oci-ref-name
#10681 by-digest `ctr image export` of `org.opencontainers.image.ref.name`
api/v1.11.0-rc.0
2026-04-28 22:29:59 +00:00
Maksym Pavlenko
edf4004f2d Merge pull request #13303 from containerd/dependabot/go_modules/github.com/containerd/go-dmverity-0.1.0
build(deps): bump github.com/containerd/go-dmverity from 0.0.0-20260106143538-e097b6cc4a33 to 0.1.0
2026-04-28 21:15:44 +00:00
Maksym Pavlenko
0a3363b44d Move remote-snapshotter.md to docs/snapshotters
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-04-28 12:41:58 -07:00
Samuel Karp
338d4a3e16 Merge pull request #13311 from samuelkarp/bump-nri
bump github.com/containerd/nri to v0.12.0
2026-04-28 19:39:42 +00:00
Maksym Pavlenko
e6b4df0ead Merge pull request #13305 from samuelkarp/mailmap
Update mailmap
2026-04-28 18:51:58 +00:00
Samuel Karp
40d7588afc Force-add NRI pkg/version/info/none file
This file is ignored by github.com/containerd/nri/.gitignore, but
required for building. The NRI repo does need to change, but until that
we can force-include the file.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2026-04-28 11:29:32 -07:00
Maksym Pavlenko
7d9dc09a19 Merge pull request #13306 from dmcgowan/api-1.11-rc
Prepare api/v1.11.0-rc.0
2026-04-28 18:10:49 +00:00
Samuel Karp
efc8e12599 bump github.com/containerd/nri to v0.12.0
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2026-04-28 10:45:05 -07:00
Derek McGowan
bf502662a5 Prepare api/v1.11.0-rc.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-27 21:53:37 -07:00
Samuel Karp
e25c936b8d Update mailmap
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2026-04-27 21:30:47 -07:00
Derek McGowan
135a6715fe Merge pull request #13302 from dmcgowan/prepare-v2.3.0-rc
Prepare release notes for  v2.3.0-rc.0
v2.3.0-rc.0
2026-04-28 03:22:06 +00:00
Derek McGowan
14fe0ac645 Merge pull request #13052 from delthas/fix-shim-sync
shim: fix send on closed channel race in task service
2026-04-28 02:24:13 +00:00
dependabot[bot]
1696b0458f build(deps): bump the otel group across 1 directory with 2 updates
Bumps the otel group with 2 updates in the / directory: [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) and [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib).


Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.67.0 to 0.68.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.67.0...zpages/v0.68.0)

Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.67.0 to 0.68.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.67.0...zpages/v0.68.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
  dependency-version: 0.68.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
  dependency-version: 0.68.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: otel
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-28 02:02:44 +00:00
dependabot[bot]
d713857a34 build(deps): bump github.com/containerd/go-dmverity
Bumps [github.com/containerd/go-dmverity](https://github.com/containerd/go-dmverity) from 0.0.0-20260106143538-e097b6cc4a33 to 0.1.0.
- [Release notes](https://github.com/containerd/go-dmverity/releases)
- [Commits](https://github.com/containerd/go-dmverity/commits/0.1.0)

---
updated-dependencies:
- dependency-name: github.com/containerd/go-dmverity
  dependency-version: 0.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-28 02:02:34 +00:00
Mike Brown
d8e7c719ae Merge pull request #11774 from sreeram-venkitesh/kep-4960-container-stop-signals
Added stop signal to container termination logic and container status
2026-04-27 23:36:01 +00:00
Derek McGowan
d54b5537a2 Prepare v2.3.0-rc.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-27 16:15:37 -07:00
Derek McGowan
31098d4704 Update release-notes for v2.3.0 release dates
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-27 16:15:37 -07:00
Derek McGowan
f04c0f0656 Update Hudson Zhu mailmap
Signed-off-by: Derek McGowan <derek@mcg.dev>
2026-04-27 08:56:32 -07:00
sreeram-venkitesh
1b1aba4b66 Added stop signal to container termination logic and container status
Signed-off-by: sreeram-venkitesh <sreeramvenkitesh@gmail.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-04-27 07:52:09 -05:00
Mike Brown
99ba3427f8 Merge pull request #13259 from mxpv/sandbox-docs
Document Sandbox API
2026-04-26 14:21:28 +00:00
Maksym Pavlenko
b6a45a1878 Merge pull request #13286 from chrischangcode/cve-2026-34986
Bump go-jose/go-jose to v4.1.4 to fix GHSA-78h2-9frx-2jm8
2026-04-26 07:12:14 +00:00
Fu Wei
f9372eccf3 Merge pull request #13269 from Apokleos/erofs-dmverity-label
snapshotter/erofs: pass explicit dm-verity metadata path via mount options
2026-04-25 20:59:12 +00:00
Alex Lyn
31ca428580 snapshots/erofs: pass dm-verity metadata path via mount options
Update the EROFS snapshotter to pass the dm-verity metadata path
through the `X-containerd.dmverity` mount option. Previously, the
system relied on implicit mode detection; providing the explicit
path allows downstream components (such as Kata Containers mount
handlers) to reliably locate and read `.dmverity` files.

Correspondingly, update the EROFS mount handler to parse and utilize
this explicit metadata path for dm-verity device initialization.
This enables the runtime to retrieve root hashes and other necessary
metadata directly, ensuring robust layer integrity verification.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
2026-04-25 18:34:57 +08:00
Alex Lyn
9c8111b70d dmverity: enhance MetadataPath() with suffix checking
We need enhance MetadataPath() with checking the layerBlobPath's
suffix to ensure it doesn't end with .dmverity.

And add a unit test asserting that MetadataPath("...dmverity")
returns the path unchanged to lock in the new behavior.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
2026-04-25 18:29:16 +08:00
Fu Wei
247b4aeeb6 Merge pull request #13251 from Sanil2108/remove-unused-init-rootfs
pkg/rootfs: remove unused InitRootFS and related helpers
2026-04-25 00:29:01 +00:00
Derek McGowan
1b71eeeae7 Merge pull request #12648 from jokemanfire/optimize
fix: ticker < sync time will cause cpu high
2026-04-24 19:24:34 +00:00
Chris Chang
5125a2af84 chore: update go-jose for CVE-2026-34986
Signed-off-by: Chris Chang <chrischang@microsoft.com>
2026-04-24 18:22:19 +00:00