cmd/ctr/commands/tasks/metrics.go | 79 1 + 78 - 0 !
pkg/cri/sbserver/container_stats_list.go | 62 1 + 61 - 0 !
2 files changed, 2 insertions(+), 139 deletions(-)

 disable windows support in ctr metric

pkg/cri/sbserver/helpers.go | 6 0 + 6 - 0 !
pkg/cri/server/container_stats_list_linux.go | 3 0 + 3 - 0 !
pkg/cri/server/helpers.go | 3 0 + 3 - 0 !
3 files changed, 12 deletions(-)

 disable runhcs option in cri config

services/server/server.go | 13 2 + 11 - 0 !
tracing/tracing.go | 7 0 + 7 - 0 !
2 files changed, 2 insertions(+), 18 deletions(-)

 disable opentelemetry

go.opentelemetry.io/contrib is not packaged.

sys/reaper/reaper_unix.go | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 go.mod: github.com/containerd/go-runc v1.1.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

cmd/ctr/commands/run/run.go | 2 1 + 1 - 0 !
pkg/cri/config/config_unix.go | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 add debian specific cni bin dir to ctr run command

pkg/cri/sbserver/podsandbox/sandbox_run_linux_test.go | 5 4 + 1 - 0 !
pkg/cri/server/sandbox_run_linux_test.go | 6 5 + 1 - 0 !
2 files changed, 9 insertions(+), 2 deletions(-)

 allow running tests with unshare(1)

Last-Updated: 2024-06-11
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070411

integration/container_exec_test.go | 2 2 + 0 - 0 !
integration/image_pull_timeout_test.go | 1 1 + 0 - 0 !
integration/restart_test.go | 4 3 + 1 - 0 !
pkg/process/io_test.go | 2 1 + 1 - 0 !
4 files changed, 7 insertions(+), 2 deletions(-)

 skip some tests that fail in debian

go.mod | 1 0 + 1 - 0 !
go.sum | 3 0 + 3 - 0 !
integration/client/go.sum | 1 0 + 1 - 0 !
integration/remote/remote_runtime.go | 15 0 + 15 - 0 !
4 files changed, 20 deletions(-)

 avoid dependency on component-base

only used for integration tests

vendor/github.com/containerd/aufs/.golangci.yml | 22 22 + 0 - 0 !
vendor/github.com/containerd/aufs/LICENSE | 201 201 + 0 - 0 !
vendor/github.com/containerd/aufs/README.md | 34 34 + 0 - 0 !
vendor/github.com/containerd/aufs/aufs.go | 438 438 + 0 - 0 !
vendor/github.com/containerd/aufs/plugin/plugin.go | 60 60 + 0 - 0 !
vendor/github.com/containerd/zfs/LICENSE | 202 202 + 0 - 0 !
vendor/github.com/containerd/zfs/README.md | 35 35 + 0 - 0 !
vendor/github.com/containerd/zfs/codecov.yml | 1 1 + 0 - 0 !
vendor/github.com/containerd/zfs/plugin/plugin.go | 62 62 + 0 - 0 !
vendor/github.com/containerd/zfs/zfs.go | 368 368 + 0 - 0 !
10 files changed, 1423 insertions(+)

 add missing sources for containerd/{zfs,aufs}

pkg/cri/instrument/instrumented_service.go | 9 9 + 0 - 0 !
pkg/cri/sbserver/service.go | 1 1 + 0 - 0 !
pkg/cri/server/service.go | 1 1 + 0 - 0 !
3 files changed, 11 insertions(+)

 add "unimplemented" stubs for runtimeconfig method required by new k8s upstream "cri-api"

oci/spec_opts.go | 24 20 + 4 - 0 !
oci/spec_opts_linux_test.go | 92 92 + 0 - 0 !
2 files changed, 112 insertions(+), 4 deletions(-)

 validate uid/gid

(cherry picked from commit 11504c3fc5f45634f2d93d57743a998194430b82)