diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-11 19:44:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 19:44:12 +0200 |
| commit | 6f3cf534b70bb14291edb14b286f1c4981f542c1 (patch) | |
| tree | fcf04fae703b72838b56655dadbdde00552467de /cmd/podman | |
| parent | b1a2657b4b00b35edd6eb1073631bc0f8c6c5c78 (diff) | |
| parent | e57b32c5956ac4f8cfdbfaabe7b23425a22a08e1 (diff) | |
| download | podman-6f3cf534b70bb14291edb14b286f1c4981f542c1.tar.gz podman-6f3cf534b70bb14291edb14b286f1c4981f542c1.tar.bz2 podman-6f3cf534b70bb14291edb14b286f1c4981f542c1.zip | |
Merge pull request #11919 from Luap99/stats-cgroup
podman stats: move cgroup validation to server
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/stats.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 11e8f6870..d21feaabc 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -11,9 +11,7 @@ import ( "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/validate" "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/utils" "github.com/docker/go-units" "github.com/pkg/errors" @@ -113,16 +111,6 @@ func checkStatOptions(cmd *cobra.Command, args []string) error { } func stats(cmd *cobra.Command, args []string) error { - if rootless.IsRootless() { - unified, err := cgroups.IsCgroup2UnifiedMode() - if err != nil { - return err - } - if !unified { - return errors.New("stats is not supported in rootless mode without cgroups v2") - } - } - // Convert to the entities options. We should not leak CLI-only // options into the backend and separate concerns. opts := entities.ContainerStatsOptions{ |