mirror of https://github.com/k3s-io/k3s
Update cadvisor deps to v0.19.3.2
Signed-off-by: Vishnu kannan <vishnuk@google.com>pull/6/head
parent
9e896e3416
commit
215d0810a2
|
@ -434,93 +434,93 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/api",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/cache/memory",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/collector",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/container",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/events",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/fs",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/healthz",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/http",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/info/v1",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/info/v2",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/manager",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/metrics",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/pages",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/storage",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/summary",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/utils",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/validate",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/cadvisor/version",
|
||||
"Comment": "v0.19.3-3-g3bfcb1e",
|
||||
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9"
|
||||
"Comment": "v0.19.3.2",
|
||||
"Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/gofuzz",
|
||||
|
|
|
@ -78,4 +78,7 @@ type ContainerHandler interface {
|
|||
|
||||
// Returns whether the container still exists.
|
||||
Exists() bool
|
||||
|
||||
// Cleanup frees up any resources being held like fds or go routines, etc.
|
||||
Cleanup()
|
||||
}
|
||||
|
|
|
@ -156,6 +156,10 @@ func newDockerContainerHandler(
|
|||
return handler, nil
|
||||
}
|
||||
|
||||
func (self *dockerContainerHandler) Cleanup() {
|
||||
self.fsHandler.stop()
|
||||
}
|
||||
|
||||
func (self *dockerContainerHandler) ContainerReference() (info.ContainerReference, error) {
|
||||
return info.ContainerReference{
|
||||
Name: self.name,
|
||||
|
|
|
@ -50,6 +50,8 @@ func (self *MockContainerHandler) ContainerReference() (info.ContainerReference,
|
|||
return args.Get(0).(info.ContainerReference), args.Error(1)
|
||||
}
|
||||
|
||||
func (self *MockContainerHandler) Cleanup() {}
|
||||
|
||||
func (self *MockContainerHandler) GetSpec() (info.ContainerSpec, error) {
|
||||
args := self.Called()
|
||||
return args.Get(0).(info.ContainerSpec), args.Error(1)
|
||||
|
|
|
@ -165,6 +165,9 @@ func (self *rawContainerHandler) GetRootNetworkDevices() ([]info.NetInfo, error)
|
|||
return nd, nil
|
||||
}
|
||||
|
||||
// Nothing to clean up.
|
||||
func (self *rawContainerHandler) Cleanup() {}
|
||||
|
||||
func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) {
|
||||
var spec info.ContainerSpec
|
||||
|
||||
|
|
|
@ -370,6 +370,8 @@ func (c *containerData) housekeeping() {
|
|||
for {
|
||||
select {
|
||||
case <-c.stop:
|
||||
// Cleanup container resources before stopping housekeeping.
|
||||
c.handler.Cleanup()
|
||||
// Stop housekeeping when signaled.
|
||||
return
|
||||
default:
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.19.3.1
|
||||
0.19.3.2
|
||||
|
|
Loading…
Reference in New Issue