diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-24 17:15:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 17:15:28 +0200 |
| commit | 4d6b66a452416b79fe5b6b6615ee5076763a44df (patch) | |
| tree | 4cbe6e33833cc49e7a56872869209f0e72d3852a /libpod/define | |
| parent | 2311a02c38d42b5e0cf3981a35701c77b1b4f6d0 (diff) | |
| parent | 2f5552c32d01678bfbfdbb8838e1672d62521a6c (diff) | |
| download | podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.tar.gz podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.tar.bz2 podman-4d6b66a452416b79fe5b6b6615ee5076763a44df.zip | |
Merge pull request #10387 from flouthoc/cgroupv1-v2-info
Podman info add support for status of standard available cgroup controllers
Diffstat (limited to 'libpod/define')
| -rw-r--r-- | libpod/define/info.go | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libpod/define/info.go b/libpod/define/info.go index c9d6877c0..de709be74 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -23,21 +23,22 @@ type SecurityInfo struct { // HostInfo describes the libpod host type HostInfo struct { - Arch string `json:"arch"` - BuildahVersion string `json:"buildahVersion"` - CgroupManager string `json:"cgroupManager"` - CGroupsVersion string `json:"cgroupVersion"` - Conmon *ConmonInfo `json:"conmon"` - CPUs int `json:"cpus"` - Distribution DistributionInfo `json:"distribution"` - EventLogger string `json:"eventLogger"` - Hostname string `json:"hostname"` - IDMappings IDMappings `json:"idMappings,omitempty"` - Kernel string `json:"kernel"` - MemFree int64 `json:"memFree"` - MemTotal int64 `json:"memTotal"` - OCIRuntime *OCIRuntimeInfo `json:"ociRuntime"` - OS string `json:"os"` + Arch string `json:"arch"` + BuildahVersion string `json:"buildahVersion"` + CgroupManager string `json:"cgroupManager"` + CGroupsVersion string `json:"cgroupVersion"` + CgroupControllers []string `json:"cgroupControllers"` + Conmon *ConmonInfo `json:"conmon"` + CPUs int `json:"cpus"` + Distribution DistributionInfo `json:"distribution"` + EventLogger string `json:"eventLogger"` + Hostname string `json:"hostname"` + IDMappings IDMappings `json:"idMappings,omitempty"` + Kernel string `json:"kernel"` + MemFree int64 `json:"memFree"` + MemTotal int64 `json:"memTotal"` + OCIRuntime *OCIRuntimeInfo `json:"ociRuntime"` + OS string `json:"os"` // RemoteSocket returns the UNIX domain socket the Podman service is listening on RemoteSocket *RemoteSocket `json:"remoteSocket,omitempty"` RuntimeInfo map[string]interface{} `json:"runtimeInfo,omitempty"` |