mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-25 10:00:53 +00:00
Update cAdvisor.
Also update golang.org/x/sys because of google/cadvisor#1786
This commit is contained in:
14
vendor/github.com/google/cadvisor/machine/machine.go
generated
vendored
14
vendor/github.com/google/cadvisor/machine/machine.go
generated
vendored
@@ -24,7 +24,6 @@ import (
|
||||
|
||||
// s390/s390x changes
|
||||
"runtime"
|
||||
"syscall"
|
||||
|
||||
info "github.com/google/cadvisor/info/v1"
|
||||
"github.com/google/cadvisor/utils"
|
||||
@@ -32,6 +31,8 @@ import (
|
||||
"github.com/google/cadvisor/utils/sysinfo"
|
||||
|
||||
"github.com/golang/glog"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -265,18 +266,13 @@ func addNode(nodes *[]info.Node, id int) (int, error) {
|
||||
|
||||
// s390/s390x changes
|
||||
func getMachineArch() (string, error) {
|
||||
uname := syscall.Utsname{}
|
||||
err := syscall.Uname(&uname)
|
||||
uname := unix.Utsname{}
|
||||
err := unix.Uname(&uname)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
var arch string
|
||||
for _, val := range uname.Machine {
|
||||
arch += string(int(val))
|
||||
}
|
||||
|
||||
return arch, nil
|
||||
return string(uname.Machine[:]), nil
|
||||
}
|
||||
|
||||
// arm32 chanes
|
||||
|
||||
Reference in New Issue
Block a user