github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 05:14:54 +00:00
Code Issues Projects Releases Wiki Activity

update cadvisor godeps to v0.30.1 to revert cadvisor#1916

Browse Source
This commit is contained in:
David Ashpole
2018-06-11 11:36:17 -07:00
parent e6f64d0a79
commit 21fd3c5cfd
8 changed files with 127 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/google/cadvisor/container/raw/factory.go generated vendored
View File

@@ -40,8 +40,8 @@ type rawFactory struct {
// Information about mounted filesystems.
fsInfo fs.FsInfo
// Watcher for fsnotify events.
watcher *common.FsnotifyWatcher
// Watcher for inotify events.
watcher *common.InotifyWatcher
// List of metrics to be ignored.
ignoreMetrics map[container.MetricKind]struct{}
@@ -78,7 +78,7 @@ func Register(machineInfoFactory info.MachineInfoFactory, fsInfo fs.FsInfo, igno
return fmt.Errorf("failed to find supported cgroup mounts for the raw factory")
}
watcher, err := common.NewFsnotifyWatcher()
watcher, err := common.NewInotifyWatcher()
if err != nil {
return err
}

2
vendor/github.com/google/cadvisor/container/raw/handler.go generated vendored
View File

@@ -49,7 +49,7 @@ func isRootCgroup(name string) bool {
return name == "/"
}
func newRawContainerHandler(name string, cgroupSubsystems *libcontainer.CgroupSubsystems, machineInfoFactory info.MachineInfoFactory, fsInfo fs.FsInfo, watcher *common.FsnotifyWatcher, rootFs string, ignoreMetrics container.MetricSet) (container.ContainerHandler, error) {
func newRawContainerHandler(name string, cgroupSubsystems *libcontainer.CgroupSubsystems, machineInfoFactory info.MachineInfoFactory, fsInfo fs.FsInfo, watcher *common.InotifyWatcher, rootFs string, ignoreMetrics container.MetricSet) (container.ContainerHandler, error) {
cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)
cHints, err := common.GetContainerHintsFromFile(*common.ArgContainerHints)