pkg/domain/infra/abi/pods_stats.go: Remove Cgroups v1

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

pkg/domain/infra/abi/pods_stats.go

@@ -11,23 +11,11 @@ import (
 	"github.com/containers/podman/v6/libpod"
 	"github.com/containers/podman/v6/libpod/define"
 	"github.com/containers/podman/v6/pkg/domain/entities"
-	"github.com/containers/podman/v6/pkg/rootless"
 	"github.com/docker/go-units"
-	"go.podman.io/common/pkg/cgroups"
 )
 
 // PodStats implements printing stats about pods.
 func (ic *ContainerEngine) PodStats(_ context.Context, namesOrIds []string, options entities.PodStatsOptions) ([]*entities.PodStatsReport, error) {
-	// Cgroups v2 check for rootless.
-	if rootless.IsRootless() {
-		unified, err := cgroups.IsCgroup2UnifiedMode()
-		if err != nil {
-			return nil, err
-		}
-		if !unified {
-			return nil, errors.New("pod stats is not supported in rootless mode without cgroups v2")
-		}
-	}
 	// Get the (running) pods and convert them to the entities format.
 	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
 	if err != nil {

pkg/specgen/generate/oci_linux.go

@@ -18,7 +18,6 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/sirupsen/logrus"
 	"go.podman.io/common/libimage"
-	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/common/pkg/config"
 	"golang.org/x/sys/unix"
 )
@@ -65,11 +64,6 @@ func getCgroupPermissions(unmask []string) string {
 	rw := "rw"
 	cgroup := "/sys/fs/cgroup"
 
-	cgroupv2, _ := cgroups.IsCgroup2UnifiedMode()
-	if !cgroupv2 {
-		return ro
-	}
-
 	if len(unmask) != 0 && unmask[0] == "ALL" {
 		return rw
 	}