container: rm CgroupSubsystems type

kolyshkin · Paweł Szulik · commit 3888dda254a8 · 2021-10-21T19:43:19.000+02:00
Replace it with map[string]string, which it is. This is a continuation
of the previous commit, separated out for review clarity.

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/cmd/internal/container/mesos/factory.go b/cmd/internal/container/mesos/factory.go
@@ -46,7 +46,7 @@ type mesosFactory struct {
 	machineInfoFactory info.MachineInfoFactory
 
 	// Information about the cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
diff --git a/cmd/internal/container/mesos/handler.go b/cmd/internal/container/mesos/handler.go
@@ -52,7 +52,7 @@ type mesosContainerHandler struct {
 
 func newMesosContainerHandler(
 	name string,
-	cgroupSubsystems containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	machineInfoFactory info.MachineInfoFactory,
 	fsInfo fs.FsInfo,
 	includedMetrics container.MetricSet,
diff --git a/cmd/internal/container/mesos/handler_test.go b/cmd/internal/container/mesos/handler_test.go
@@ -22,7 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -42,7 +41,7 @@ func TestContainerReference(t *testing.T) {
 		name                 string
 		machineInfoFactory   info.MachineInfoFactory
 		fsInfo               fs.FsInfo
-		cgroupSubsystems     containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
diff --git a/container/containerd/factory.go b/container/containerd/factory.go
@@ -48,7 +48,7 @@ type containerdFactory struct {
 	client             ContainerdClient
 	version            string
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 	// Information about mounted filesystems.
 	fsInfo          fs.FsInfo
 	includedMetrics container.MetricSet
diff --git a/container/containerd/handler.go b/container/containerd/handler.go
@@ -59,7 +59,7 @@ func newContainerdContainerHandler(
 	name string,
 	machineInfoFactory info.MachineInfoFactory,
 	fsInfo fs.FsInfo,
-	cgroupSubsystems containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	includedMetrics container.MetricSet,
diff --git a/container/containerd/handler_test.go b/container/containerd/handler_test.go
@@ -24,7 +24,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -50,7 +49,7 @@ func TestHandler(t *testing.T) {
 		name                 string
 		machineInfoFactory   info.MachineInfoFactory
 		fsInfo               fs.FsInfo
-		cgroupSubsystems     containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
diff --git a/container/crio/factory.go b/container/crio/factory.go
@@ -50,7 +50,7 @@ type crioFactory struct {
 	storageDir    string
 
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
diff --git a/container/crio/handler.go b/container/crio/handler.go
@@ -84,7 +84,7 @@ func newCrioContainerHandler(
 	fsInfo fs.FsInfo,
 	storageDriver storageDriver,
 	storageDir string,
-	cgroupSubsystems containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	includedMetrics container.MetricSet,
diff --git a/container/crio/handler_test.go b/container/crio/handler_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -35,7 +34,7 @@ func TestHandler(t *testing.T) {
 		fsInfo               fs.FsInfo
 		storageDriver        storageDriver
 		storageDir           string
-		cgroupSubsystems     containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
diff --git a/container/docker/factory.go b/container/docker/factory.go
@@ -116,7 +116,7 @@ type dockerFactory struct {
 	client *docker.Client
 
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
diff --git a/container/docker/handler.go b/container/docker/handler.go
@@ -121,7 +121,7 @@ func newDockerContainerHandler(
 	fsInfo fs.FsInfo,
 	storageDriver storageDriver,
 	storageDir string,
-	cgroupSubsystems containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	dockerVersion []int,
diff --git a/container/libcontainer/helpers.go b/container/libcontainer/helpers.go
@@ -29,12 +29,10 @@ import (
 	"k8s.io/klog/v2"
 )
 
-// CgroupSubsystems is a map of cgroup controllers to their mount points.
+// GetCgroupSubsystems returns information about the cgroup subsystems that are
+// of interest as a map of cgroup controllers to their mount points.
 // For example, "cpu" -> "/sys/fs/cgroup/cpu".
-type CgroupSubsystems map[string]string
-
-// Get information about the cgroup subsystems those we want
-func GetCgroupSubsystems(includedMetrics container.MetricSet) (CgroupSubsystems, error) {
+func GetCgroupSubsystems(includedMetrics container.MetricSet) (map[string]string, error) {
 	// Get all cgroup mounts.
 	allCgroups, err := cgroups.GetCgroupMounts(true)
 	if err != nil {
@@ -76,7 +74,7 @@ func GetCgroupSubsystems(includedMetrics container.MetricSet) (CgroupSubsystems,
 }
 
 // Get information about all the cgroup subsystems.
-func GetAllCgroupSubsystems() (CgroupSubsystems, error) {
+func GetAllCgroupSubsystems() (map[string]string, error) {
 	// Get all cgroup mounts.
 	allCgroups, err := cgroups.GetCgroupMounts(true)
 	if err != nil {
@@ -87,7 +85,7 @@ func GetAllCgroupSubsystems() (CgroupSubsystems, error) {
 	return getCgroupSubsystemsHelper(allCgroups, emptyDisableCgroups)
 }
 
-func getCgroupSubsystemsHelper(allCgroups []cgroups.Mount, disableCgroups map[string]struct{}) (CgroupSubsystems, error) {
+func getCgroupSubsystemsHelper(allCgroups []cgroups.Mount, disableCgroups map[string]struct{}) (map[string]string, error) {
 	if len(allCgroups) == 0 {
 		return nil, fmt.Errorf("failed to find cgroup mounts")
 	}
diff --git a/container/libcontainer/helpers_test.go b/container/libcontainer/helpers_test.go
@@ -44,7 +44,7 @@ func cgroupMountsAt(path string, subsystems []string) []cgroups.Mount {
 func TestGetCgroupSubsystems(t *testing.T) {
 	testCases := []struct {
 		mounts   []cgroups.Mount
-		expected CgroupSubsystems
+		expected map[string]string
 		err      bool
 	}{
 		{
diff --git a/container/raw/factory.go b/container/raw/factory.go
@@ -39,7 +39,7 @@ type rawFactory struct {
 	machineInfoFactory info.MachineInfoFactory
 
 	// Information about the cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
diff --git a/container/raw/handler.go b/container/raw/handler.go
@@ -48,7 +48,7 @@ func isRootCgroup(name string) bool {
 	return name == "/"
 }
 
-func newRawContainerHandler(name string, cgroupSubsystems libcontainer.CgroupSubsystems, machineInfoFactory info.MachineInfoFactory, fsInfo fs.FsInfo, watcher *common.InotifyWatcher, rootFs string, includedMetrics container.MetricSet) (container.ContainerHandler, error) {
+func newRawContainerHandler(name string, cgroupSubsystems map[string]string, machineInfoFactory info.MachineInfoFactory, fsInfo fs.FsInfo, watcher *common.InotifyWatcher, rootFs string, includedMetrics container.MetricSet) (container.ContainerHandler, error) {
 	cHints, err := common.GetContainerHintsFromFile(*common.ArgContainerHints)
 	if err != nil {
 		return nil, err
