diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-22 21:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 21:00:57 +0000 |
| commit | 2270be1871bbf77ed148a623231d41638975572d (patch) | |
| tree | fdbf198ef9d5d6be8c75d8a694876e026afc9a34 | |
| parent | a8917996c43a5149eba0220cebc080148908cd4a (diff) | |
| parent | 99386c7ae74a279a5dafc9bffc780440f0ef7f51 (diff) | |
| download | podman-2270be1871bbf77ed148a623231d41638975572d.tar.gz podman-2270be1871bbf77ed148a623231d41638975572d.tar.bz2 podman-2270be1871bbf77ed148a623231d41638975572d.zip | |
Merge pull request #7729 from mheon/info_cgroup_manager
Include cgroup manager in `podman info` output
| -rw-r--r-- | libpod/define/info.go | 1 | ||||
| -rw-r--r-- | libpod/info.go | 1 | ||||
| -rw-r--r-- | test/system/005-info.bats | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libpod/define/info.go b/libpod/define/info.go index 47c53d067..f0e05801c 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -15,6 +15,7 @@ type Info struct { 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"` diff --git a/libpod/info.go b/libpod/info.go index 153000b6f..dd7a521c1 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -87,6 +87,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { info := define.HostInfo{ Arch: runtime.GOARCH, BuildahVersion: buildah.Version, + CgroupManager: r.config.Engine.CgroupManager, Linkmode: linkmode.Linkmode(), CPUs: runtime.NumCPU(), Distribution: hostDistributionInfo, diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 3f1efd364..ef3e97af0 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -19,6 +19,8 @@ graphRoot: graphStatus: imageStore:\\\s\\\+number: 1 runRoot: +cgroupManager: +cgroupVersion: v " while read expect; do is "$output" ".*$expect" "output includes '$expect'" |