Commit Graph

15370 Commits

Author SHA1 Message Date
Aadhar Agarwal
b641933cfa erofs snapshotter: Add tar index mode
Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>

Minor style updates to erofs.md and differ_linux.go

Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>

Add use case for tar index in erofs.md

Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>
2025-07-08 21:44:49 +00:00
Derek McGowan
4fe6eb20cc Merge pull request #12065 from fidencio/topic/blockfile-ensure-loop-is-part-of-the-mount-options
blockfile: Ensure required options are always set
2025-07-08 14:29:39 +00:00
Fabiano Fidêncio
e0d733c871 blockfile: Ensure required options are always set
When using blockfile snapshotter and passing specific filesystem mount
options, the users may be caught by surprise by the fact that some
options are required but not documented anywhere.

The easiest way to solve this is by ensuring that the "loop" required
option is always added to the mount options.

Signed-off-by: Fabiano Fidêncio <fidencio@northflank.com>
2025-07-07 22:32:07 +02:00
Fu Wei
87742bd35f Merge pull request #11857 from djdongjin/remove-go-version-specific-code
chore: remove go version specific code
2025-07-06 19:02:31 +00:00
Phil Estes
5a8ab17048 Merge pull request #12015 from rzlink/memory
fix(cri): Correct Commit Memory Aggregation for Windows Containers
2025-07-02 19:53:02 +00:00
Akihiro Suda
6fa6aa9b38 Merge pull request #12046 from erofs/erofs-snapshotter
erofs-differ: fix filesystem UUID for tar-converted layers
2025-07-02 15:06:19 +00:00
Phil Estes
a0281df260 Merge pull request #12028 from chrishenzie/github-actions
Add GitHub Action for k8s node e2e tests
2025-07-02 03:08:37 +00:00
Gao Xiang
a0ed14fd48 erofs-differ: fix filesystem UUID for tar-converted layers
Derive filesystem UUIDs (`lsblk -o +UUID`) from the OCI layer digests
(although diffIDs are better in principle, but they're unavailable by
differs in advance) rather than generating a random one.  This allows
EROFS to uniquely identify each layer using the content-addressable
filesystem UUID.

It can also be used for reproducible builds. To achieve this, configure
`mkfs_options` with `-T0 --mkfs-time` (However, `--mkfs-time` requires
erofs-utils 1.8+; Otherwise, all inode timestamps will be reset w/o it):

``` toml
  [plugins."io.containerd.differ.v1.erofs"]
    mkfs_options = ["-T0 --mkfs-time"]
```

Fixes: c73c8e5d52 ("Introduce EROFS differ")
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
2025-07-02 08:25:50 +08:00
Akihiro Suda
0107c53123 Merge pull request #12036 from DataDog/eric.mountain/stable-rh-order
fix:cri: Stable order for StatusResponse.RuntimeHandlers
2025-07-02 00:03:30 +00:00
Akihiro Suda
7aabc4b399 Merge pull request #12040 from containerd/dependabot/go_modules/github.com/intel/goresctrl-0.9.0
build(deps): bump github.com/intel/goresctrl from 0.8.0 to 0.9.0
2025-07-01 22:29:29 +00:00
Akihiro Suda
13b6e0f760 Merge pull request #12044 from containerd/dependabot/github_actions/github/codeql-action-3.29.2
build(deps): bump github/codeql-action from 3.29.0 to 3.29.2
2025-07-01 22:29:02 +00:00
Derek McGowan
4d89721f23 Merge pull request #11623 from yashsingh74/update-golangci-v2
ci: bump golangci from 6.5.2 to 7.0.0
2025-07-01 18:06:14 +00:00
Chris Henzie
b92e8b544a Add GitHub Action for k8s node e2e tests
Introduces a workflow to run Kubernetes node e2e tests against
containerd pull requests. This is the first step in migrating
containerd's CI off of the community-owned prow.k8s.io infrastructure.

This new workflow is modeled after the existing presubmit job:
https://github.com/kubernetes/test-infra/blob/master/config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml

Initially this workflow will not be required to pass on PRs. We can make
it required later once it's proven to be stable.

Signed-off-by: Chris Henzie <chrishenzie@google.com>
2025-07-01 10:46:17 -07:00
Phil Estes
2252f5d645 Merge pull request #12041 from containerd/dependabot/go_modules/go.etcd.io/bbolt-1.4.2
build(deps): bump go.etcd.io/bbolt from 1.4.1 to 1.4.2
2025-07-01 17:10:17 +00:00
Eric Mountain
eb63b5b4df Amend runtime handler test for stable order
Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
2025-07-01 09:57:38 +02:00
Eric Mountain
c6ae081934 CRI: Stable sort for RuntimeHandlers
The runtimeHandlers list in the response to `crictl info` has unstable ordering
since commit 97eb1cd (underlying switch from list to map) that was shipped in
v2.1.0.

On Kubernetes nodes this causes the kubelet to update node status subresources
every time the order of runtime handlers changes in the status response from
containerd. The lieklihood increases with the number of runtime handlers present
on nodes. In some clusters this leads to every single node sending a status update
every few seconds leading to excessive Kube API server load.

This change enforces stable ordering on runtime handler names.

Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
2025-07-01 09:57:37 +02:00
Eric Mountain
f51a2fbfde Test showing RuntimeHandlers in Status() are unordered
Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
2025-07-01 09:57:34 +02:00
dependabot[bot]
cc913cac60 build(deps): bump github/codeql-action from 3.29.0 to 3.29.2
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.0 to 3.29.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](ce28f5bb42...181d5eefc2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-01 03:46:56 +00:00
dependabot[bot]
40f3b74afd build(deps): bump go.etcd.io/bbolt from 1.4.1 to 1.4.2
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-version: 1.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-01 02:50:32 +00:00
dependabot[bot]
587c0757bc build(deps): bump github.com/intel/goresctrl from 0.8.0 to 0.9.0
Bumps [github.com/intel/goresctrl](https://github.com/intel/goresctrl) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/intel/goresctrl/releases)
- [Commits](https://github.com/intel/goresctrl/compare/v0.8.0...v0.9.0)

---
updated-dependencies:
- dependency-name: github.com/intel/goresctrl
  dependency-version: 0.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-01 02:45:19 +00:00
Fu Wei
46ec3dda53 Merge pull request #12039 from estesp/fix-map-concurrent-write
Fix port forward error logger to not cause concurrent write
2025-07-01 01:53:46 +00:00
Ubuntu
35cbd7349e Fix port forward error logger to not cause concurrent write
Change the logging output of a struct to only list the pointer value
to remove the traversal of a map that is not thread safe and can
at times generate a concurrent map write error

Signed-off-by: Phil Estes <estesp@amazon.com>
2025-06-30 15:24:11 -04:00
Dawei Wei
7a46fe7e68 Correct Commit Memory Aggregation for Windows Containers
Summary
Fixes Windows container memory stats by correctly aggregating CommitMemoryBytes and handling missing stats gracefully.

Key Changes
Fixed aggregation of CommitMemoryBytes in appendMemoryPodStats

Mapped MemoryUsageCommitBytes to container UsageBytes

Handled nil stats without breaking pod-level reporting

Added tests for missing memory stats and updated assertions

Bug
Pod-level memory stats were incomplete due to missing CommitMemoryBytes aggregation. This fix ensures accurate reporting across containers.

Testing
New test for missing stats

All existing tests pass

Improved test clarity and coverage

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2025-06-30 11:49:45 -07:00
Phil Estes
89b7202173 Merge pull request #12004 from austinvazquez/remove-unused-scripts-for-windows-2019
Remove unused Windows 2019 powershell scripts
2025-06-30 12:44:44 -04:00
Phil Estes
a52fef52c7 Merge pull request #12014 from containerd/dependabot/github_actions/docker/setup-buildx-action-3.11.1
build(deps): bump docker/setup-buildx-action from 3.11.0 to 3.11.1
2025-06-30 16:08:26 +00:00
Phil Estes
38e119814b Merge pull request #12008 from ningmingxiao/fix_ci3
ci:fix ci TestContainerExecLargeOutputWithTTY panic
2025-06-30 15:57:45 +00:00
Phil Estes
8c94d9b602 Merge pull request #11963 from containerd/dependabot/go_modules/google.golang.org/grpc-1.73.0
build(deps): bump google.golang.org/grpc from 1.72.2 to 1.73.0
2025-06-27 19:25:33 +00:00
Phil Estes
5bf40cb8e0 Merge pull request #11933 from dmcgowan/gha-use-latest-images
Update GHA runners to use latest image for most jobs
2025-06-27 18:48:05 +00:00
dependabot[bot]
100b78711d build(deps): bump google.golang.org/grpc from 1.72.2 to 1.73.0
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.72.2 to 1.73.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.72.2...v1.73.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-27 18:44:15 +00:00
Phil Estes
865b4195a3 Merge pull request #11859 from containerd/dependabot/go_modules/k8s-c1a5b07740
build(deps): bump the k8s group across 1 directory with 3 updates
2025-06-27 17:52:03 +00:00
Mike Brown
206dba601b Merge pull request #12006 from R3hankhan123/cri-coverage
Add coverage support for CRI integration tests
2025-06-27 17:30:53 +00:00
Rehan Khan
621d661be8 Add coverage support for CRI integration tests
Signed-off-by: Rehan Khan <Rehan.Khan7@ibm.com>
2025-06-27 18:42:51 +05:30
Derek McGowan
d553c4014e Update GHA runners to use latest image for most jobs
For jobs which do not require a version matrix, such as some testing
runs, use the latest runner image. Pinning the images unnecessarily
causes more work later on when deciding when to upgrade and may cause
more issues when older images brownout.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2025-06-24 17:11:30 -07:00
dependabot[bot]
b952651247 build(deps): bump docker/setup-buildx-action from 3.11.0 to 3.11.1
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](18ce135bb5...e468171a9d)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-version: 3.11.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-24 02:11:41 +00:00
dependabot[bot]
9f9ce00aa0 build(deps): bump the k8s group across 1 directory with 3 updates
Bumps the k8s group with 3 updates in the / directory: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery), [k8s.io/client-go](https://github.com/kubernetes/client-go) and [k8s.io/cri-api](https://github.com/kubernetes/cri-api).


Updates `k8s.io/apimachinery` from 0.32.3 to 0.33.0
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.32.3...v0.33.0)

Updates `k8s.io/client-go` from 0.32.3 to 0.33.0
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.32.3...v0.33.0)

Updates `k8s.io/cri-api` from 0.32.3 to 0.33.0
- [Commits](https://github.com/kubernetes/cri-api/compare/v0.32.3...v0.33.0)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s
- dependency-name: k8s.io/client-go
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s
- dependency-name: k8s.io/cri-api
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-24 01:46:42 +00:00
Derek McGowan
99df502341 Merge pull request #11981 from cpuguy83/remote_readerat
Implement io.ReaderAt on docker fetch reader
2025-06-23 22:40:24 +00:00
Akihiro Suda
9300d03899 Merge pull request #11885 from ningmingxiao/fix_nerdctl_unknown
bugfix:close container io when runtime create failed
2025-06-22 01:00:09 +00:00
ningmingxiao
a79e791413 ci:fix ci TestContainerExecLargeOutputWithTTY panic
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
2025-06-21 13:16:27 +08:00
Phil Estes
5dc23ca673 Merge pull request #11987 from containerd/dependabot/github_actions/softprops/action-gh-release-2.3.2
build(deps): bump softprops/action-gh-release from 2.2.2 to 2.3.2
2025-06-20 18:20:21 +00:00
Phil Estes
c3303ab3af Merge pull request #11990 from containerd/dependabot/go_modules/github.com/urfave/cli/v2-2.27.7
build(deps): bump github.com/urfave/cli/v2 from 2.27.6 to 2.27.7
2025-06-20 18:19:51 +00:00
Phil Estes
0fc76bf503 Merge pull request #11989 from containerd/dependabot/go_modules/github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus-1.1.0
build(deps): bump github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus from 1.0.1 to 1.1.0
2025-06-20 18:19:33 +00:00
Akihiro Suda
39533c949b Merge pull request #11986 from containerd/dependabot/github_actions/github/codeql-action-3.29.0
build(deps): bump github/codeql-action from 3.28.18 to 3.29.0
2025-06-20 03:28:47 +00:00
Akihiro Suda
e61e7cba1a Merge pull request #11964 from containerd/dependabot/go_modules/golang-x-6abdd2e072
build(deps): bump the golang-x group with 2 updates
2025-06-20 00:00:38 +00:00
Austin Vazquez
97bbc1f73a Remove unused Windows 2019 powershell scripts
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2025-06-19 15:32:46 -07:00
Phil Estes
5e1f8ff486 Merge pull request #11992 from azr/fix-multipart-fetch-missing-content-len
Fix multipart fetch issue when the server does not return content length
2025-06-19 20:25:02 +00:00
Adrien Delorme
cb53f381e4 fix when multipart fetching and the server does not return content length
Signed-off-by: Adrien Delorme <azr@users.noreply.github.com>
2025-06-19 17:45:01 +02:00
Derek McGowan
7d394c9e2c Merge pull request #11998 from dmcgowan/avoid-unconditional-range-fetch
Fix fetch always adding range to requests
2025-06-19 22:03:46 +08:00
Derek McGowan
d3516916aa Fix fetch always adding range to requests
Add condition for adding range header to avoid unnecessary header when
parallel pull is not being used. Some registries do not properly handle
the range header.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2025-06-18 22:22:54 -07:00
dependabot[bot]
aea4e685e6 build(deps): bump github.com/urfave/cli/v2 from 2.27.6 to 2.27.7
Bumps [github.com/urfave/cli/v2](https://github.com/urfave/cli) from 2.27.6 to 2.27.7.
- [Release notes](https://github.com/urfave/cli/releases)
- [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/urfave/cli/compare/v2.27.6...v2.27.7)

---
updated-dependencies:
- dependency-name: github.com/urfave/cli/v2
  dependency-version: 2.27.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-19 02:49:53 +00:00
Akihiro Suda
6c110c1f4c Merge pull request #11985 from containerd/dependabot/go_modules/go.etcd.io/bbolt-1.4.1
build(deps): bump go.etcd.io/bbolt from 1.4.0 to 1.4.1
2025-06-19 02:01:57 +00:00