Skip to content

[pull] main from containerd:main#56

Open
pull[bot] wants to merge 5811 commits intofahedouch:mainfrom
containerd:main
Open

[pull] main from containerd:main#56
pull[bot] wants to merge 5811 commits intofahedouch:mainfrom
containerd:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Aug 2, 2022

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

HirazawaUi and others added 30 commits March 30, 2026 09:01
Signed-off-by: HirazawaUi <695097494plus@gmail.com>
Signed-off-by: HirazawaUi <695097494plus@gmail.com>
feat: Allow containers to use both host network and user namespace
fix: hide `go-cmp` library from the non-test code path
cri: mirror cadvisor UsageNanoCores semantics
Bumps [azure/CLI](https://github.com/azure/cli) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/azure/cli/releases)
- [Changelog](https://github.com/Azure/cli/blob/master/ReleaseProcess.md)
- [Commits](Azure/cli@9f7ce6f...9eb25b8)

---
updated-dependencies:
- dependency-name: azure/CLI
  dependency-version: 3.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.33.0 to 4.35.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@b1bff81...c10b806)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.35.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.2.4 to 2.3.0.
- [Release notes](https://github.com/pelletier/go-toml/releases)
- [Commits](pelletier/go-toml@v2.2.4...v2.3.0)

---
updated-dependencies:
- dependency-name: github.com/pelletier/go-toml/v2
  dependency-version: 2.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ctions/cache-5.0.4

build(deps): bump actions/cache from 5.0.3 to 5.0.4
Updates crun version used by integration tests to 1.27 and enables the
test for cgroup mount options in
TestPrivilegedContainerCgroupMountOptions.

Assisted-by: Antigravity
Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
…zure/login-3.0.0

build(deps): bump azure/login from 2.3.0 to 3.0.0
Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>
This change updates the Go version from 1.25.8 to 1.26.0 across the
repository, including CI configurations, build scripts, and development
environments.

It also fixes two linter issues discovered after upgrading the Go version:
- core/snapshots/storage/bolt.go: incorrect printf format for uint64
- plugins/transfer/plugin.go: incorrect printf format for int and unused variable

The golangci-lint version in script/setup/install-dev-tools is also updated to v2.9.0
to match CI.

Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
…zure/CLI-3.0.0

build(deps): bump azure/CLI from 2.2.0 to 3.0.0
tracing: add option to inject trace ID into logrus fields
core/remotes: MakeRefKey: update godoc and change Warn to Debug logs
Update crun version to 1.27 and enable in mount options test
…th-goverity

Add dmverity support to the erofs snapshotter using go-dmverity
…ctions/attest-build-provenance-4.1.0

build(deps): bump actions/attest-build-provenance from 3.2.0 to 4.1.0
…ctions/upload-artifact-7.0.0

build(deps): bump actions/upload-artifact from 6.0.0 to 7.0.0
In order to support `os.features`.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
If no snapshotter is specified and `os.features` contains "erofs",
unpacking should use the EROFS snapshotter and differ.

This enhances the usability of native EROFS container images.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Just use apitypes.OCIPlatformFromProto().

Suggested-by: Jin Dong <djdongjin95@gmail.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
…e` is set

If no snapshotter is specified, container run selects the default
snapshotter.

However, if `os.features` is set, we should always call
`checkSnapshotterSupport()`.  This ensures containerd clients
report a clear error:

```
ctr: snapshotter overlayfs does not support platform
{amd64 linux  [erofs] } for image sha256:[]
```

instead of the confusing layer extraction error:

```
ctr: apply layer error for "": failed to extract layer sha256:[]:
failed to get stream processor for application/vnd.erofs.layer.v1:
no processor for media-type
```

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
…b.com/pelletier/go-toml/v2-2.3.0

build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.4 to 2.3.0
…ithub/codeql-action-4.35.1

build(deps): bump github/codeql-action from 4.33.0 to 4.35.1
…ng/pkg/httpstream

Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
Signed-off-by: Sergey Kanzhelev <S.Kanzhelev@live.com>
samuelkarp and others added 30 commits April 28, 2026 10:45
Signed-off-by: Samuel Karp <samuelkarp@google.com>
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>
bump github.com/containerd/nri to v0.12.0
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
…b.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
…-ref-name

#10681 by-digest `ctr image export` of `org.opencontainers.image.ref.name`
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>
…6f3ef841a9

build(deps): bump the otel group across 1 directory with 2 updates
Signed-off-by: Derek McGowan <derek@mcg.dev>
No changes, just rc tag

Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Implement NRI metrics adaptation layer
Move remote-snapshotter.md to docs/snapshotters
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>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Assisted-by: gemini-cli
Signed-off-by: Samuel Karp <samuelkarp@google.com>
mailmap: update for 2.3.0 release
Deprecate shim.Command
Signed-off-by: Derek McGowan <derek@mcg.dev>
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>
config: preserve legacy grpc address across sparse imports
Prepare release notes for api/v1.11.0
erofs: remove fsmerge threshold from snapshotter
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
Prepare release notes for v2.3.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.