pkg/specgen/namespaces.go: Remove Cgroups v1

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
Lokesh Mandvekar
2025-11-05 09:26:01 -05:00
parent c98c50ec76
commit 850bae519e

View File

@@ -14,7 +14,6 @@ import (
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/generate"
"go.podman.io/common/libnetwork/types" "go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/cgroups"
"go.podman.io/common/pkg/config" "go.podman.io/common/pkg/config"
"go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/fileutils"
"go.podman.io/storage/pkg/unshare" "go.podman.io/storage/pkg/unshare"
@@ -262,26 +261,14 @@ func ParseNamespace(ns string) (Namespace, error) {
// ParseCgroupNamespace parses a cgroup namespace specification in string // ParseCgroupNamespace parses a cgroup namespace specification in string
// form. // form.
func ParseCgroupNamespace(ns string) (Namespace, error) { func ParseCgroupNamespace(ns string) (Namespace, error) {
toReturn := Namespace{}
// Cgroup is host for v1, private for v2.
// We can't trust c/common for this, as it only assumes private.
cgroupsv2, err := cgroups.IsCgroup2UnifiedMode()
if err != nil {
return toReturn, err
}
if cgroupsv2 {
switch ns { switch ns {
case "host": case "host":
toReturn.NSMode = Host return Namespace{NSMode: Host}, nil
case "private", "": case "private", "":
toReturn.NSMode = Private return Namespace{NSMode: Private}, nil
default: default:
return toReturn, fmt.Errorf("unrecognized cgroup namespace mode %s passed", ns) return Namespace{}, fmt.Errorf("unrecognized cgroup namespace mode %s passed", ns)
} }
} else {
toReturn.NSMode = Host
}
return toReturn, nil
} }
// ParseIPCNamespace parses an ipc namespace specification in string // ParseIPCNamespace parses an ipc namespace specification in string