kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add os type to DaemonInfo

pull/7984/head
Medya Gh 2020-05-02 17:02:19 -07:00
parent 100ba9b8d3
commit ee9004f93b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/drivers/kic/oci/info.go
View File

@ -27,8 +27,9 @@ import (
// SysInfo Info represents common system Information between docker and podman that minikube cares // SysInfo Info represents common system Information between docker and podman that minikube cares
type SysInfo struct { type SysInfo struct {
CPUs int // CPUs is Number of CPUs CPUs int // CPUs is Number of CPUs
TotalMemory int64 // TotalMemory Total available ram TotalMemory int64 // TotalMemory Total available ram
OSType string // container's OsType (windows or linux)
} }
// DaemonInfo returns common docker/podman daemon system info that minikube cares about // DaemonInfo returns common docker/podman daemon system info that minikube cares about
@ -38,11 +39,13 @@ func DaemonInfo(ociBin string) (SysInfo, error) {
p, err := podmanSystemInfo() p, err := podmanSystemInfo()
info.CPUs = p.Host.Cpus info.CPUs = p.Host.Cpus
info.TotalMemory = p.Host.MemTotal info.TotalMemory = p.Host.MemTotal
info.OSType = p.Host.Os
return info, err return info, err
} }
d, err := dockerSystemInfo() d, err := dockerSystemInfo()
info.CPUs = d.NCPU info.CPUs = d.NCPU
info.TotalMemory = d.MemTotal info.TotalMemory = d.MemTotal
info.OSType = d.OSType
return info, err return info, err
} }