Switch to opencontainers/cgroups repository

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

container/common/helpers.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/karrick/godirwalk"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 

container/containerd/handler.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/containerd/errdefs"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/net/context"
 

container/crio/handler.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/common"

container/docker/handler.go

@@ -31,7 +31,7 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/zfs"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 
 	docker "github.com/docker/docker/client"
 	"golang.org/x/net/context"

container/libcontainer/handler.go

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
+	"github.com/opencontainers/cgroups"
+	"github.com/opencontainers/cgroups/fs2"
 	"k8s.io/klog/v2"
 
 	"github.com/google/cadvisor/container"

container/libcontainer/handler_test.go

@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 	"github.com/stretchr/testify/assert"
 
 	info "github.com/google/cadvisor/info/v1"

container/libcontainer/helpers.go

@@ -17,15 +17,12 @@ package libcontainer
 import (
 	"fmt"
 
-	info "github.com/google/cadvisor/info/v1"
-
-	"github.com/opencontainers/runc/libcontainer/cgroups"
-
 	"github.com/google/cadvisor/container"
+	info "github.com/google/cadvisor/info/v1"
 
-	fs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
-	fs2 "github.com/opencontainers/runc/libcontainer/cgroups/fs2"
-	configs "github.com/opencontainers/runc/libcontainer/configs"
+	"github.com/opencontainers/cgroups"
+	fs "github.com/opencontainers/cgroups/fs"
+	fs2 "github.com/opencontainers/cgroups/fs2"
 	"k8s.io/klog/v2"
 )
 
@@ -157,9 +154,9 @@ func diskStatsCopy(blkioStats []cgroups.BlkioStatEntry) (stat []info.PerDiskStat
 }
 
 func NewCgroupManager(name string, paths map[string]string) (cgroups.Manager, error) {
-	config := &configs.Cgroup{
+	config := &cgroups.Cgroup{
 		Name:      name,
-		Resources: &configs.Resources{},
+		Resources: &cgroups.Resources{},
 	}
 	if cgroups.IsCgroup2UnifiedMode() {
 		path := paths[""]

container/libcontainer/helpers_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 	"github.com/stretchr/testify/assert"
 )
 

container/podman/handler.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	dockercontainer "github.com/docker/docker/api/types/container"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/common"

container/podman/plugin.go

@@ -17,7 +17,7 @@ package podman
 import (
 	"fmt"
 
-	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/cgroups"
 	"k8s.io/klog/v2"
 
 	"github.com/google/cadvisor/container"