Merge pull request #7105 from AkihiroSuda/fix-cgroupversion-string

compat/info.go: TrimPrefix(CGroupsVersion, "v")
This commit is contained in:
OpenShift Merge Robot
2020-07-28 15:01:37 +02:00
committed by GitHub

View File

@ -119,7 +119,7 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
BuildahVersion: infoData.Host.BuildahVersion, BuildahVersion: infoData.Host.BuildahVersion,
CPURealtimePeriod: sysInfo.CPURealtimePeriod, CPURealtimePeriod: sysInfo.CPURealtimePeriod,
CPURealtimeRuntime: sysInfo.CPURealtimeRuntime, CPURealtimeRuntime: sysInfo.CPURealtimeRuntime,
CgroupVersion: infoData.Host.CGroupsVersion, CgroupVersion: strings.TrimPrefix(infoData.Host.CGroupsVersion, "v"),
Rootless: rootless.IsRootless(), Rootless: rootless.IsRootless(),
SwapFree: infoData.Host.SwapFree, SwapFree: infoData.Host.SwapFree,
SwapTotal: infoData.Host.SwapTotal, SwapTotal: infoData.Host.SwapTotal,