From: Reinhard Tartler Date: Tue, 24 Mar 2026 20:27:07 -0400 Subject: Avoid dependency on containerd/cgroups v1.1.0 --- go.mod | 3 ++- pkg/cgroup/cgroup.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e7ed2cf..da03547 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.16 github.com/aws/aws-sdk-go-v2/credentials v1.13.16 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56 - github.com/containerd/cgroups v1.1.0 github.com/containerd/cgroups/v3 v3.0.2 github.com/containerd/containerd v1.7.7 github.com/containerd/continuity v0.4.2 @@ -54,6 +53,8 @@ require ( k8s.io/utils v0.0.0-20230726121419-3b25d923346b ) +require github.com/containerd/cgroups v1.1.0 // indirect + require ( github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/pkg/cgroup/cgroup.go b/pkg/cgroup/cgroup.go index c74b572..ba1277f 100644 --- a/pkg/cgroup/cgroup.go +++ b/pkg/cgroup/cgroup.go @@ -9,7 +9,7 @@ package cgroup import ( "errors" - "github.com/containerd/cgroups" + "github.com/containerd/cgroups/v3" v1 "github.com/containerd/nydus-snapshotter/pkg/cgroup/v1" v2 "github.com/containerd/nydus-snapshotter/pkg/cgroup/v2" )