summaryrefslogtreecommitdiff
path: root/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-30 05:30:22 -0400
committerGitHub <noreply@github.com>2021-06-30 05:30:22 -0400
commit0d8d805a76762276c62bd7260a39eb26e99722b4 (patch)
tree9a3ead552f88cf53eab2878480fc0500533b2ceb /vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
parent4dc87c2a3a45db32fbded8b4a0a23d874b3e464a (diff)
parent05f39af5bd716ce8d02a41e5c0aa1a2d632dab07 (diff)
downloadpodman-0d8d805a76762276c62bd7260a39eb26e99722b4.tar.gz
podman-0d8d805a76762276c62bd7260a39eb26e99722b4.tar.bz2
podman-0d8d805a76762276c62bd7260a39eb26e99722b4.zip
Merge pull request #10761 from containers/dependabot/go_modules/github.com/containers/storage-1.32.4
Bump github.com/containers/storage from 1.32.3 to 1.32.4
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go')
-rw-r--r--vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
index 87d0da842..a1e7f0afd 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
@@ -13,12 +13,12 @@ const (
Thawed FreezerState = "THAWED"
)
+// Cgroup holds properties of a cgroup on Linux.
type Cgroup struct {
- // Deprecated, use Path instead
+ // Name specifies the name of the cgroup
Name string `json:"name,omitempty"`
- // name of parent of cgroup or slice
- // Deprecated, use Path instead
+ // Parent specifies the name of parent of cgroup or slice
Parent string `json:"parent,omitempty"`
// Path specifies the path to cgroups that are created and/or joined by the container.
@@ -127,8 +127,8 @@ type Resources struct {
// SkipDevices allows to skip configuring device permissions.
// Used by e.g. kubelet while creating a parent cgroup (kubepods)
- // common for many containers.
+ // common for many containers, and by runc update.
//
// NOTE it is impossible to start a container which has this flag set.
- SkipDevices bool `json:"skip_devices"`
+ SkipDevices bool `json:"-"`
}