github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #129133 from cwangVT/bm-cadvisor-v0.49.2

Browse Source 
bump cadvisor to v0.49.2 in release 1.30
This commit is contained in:
Kubernetes Prow Robot 2025-01-28 05:07:24 -08:00 committed by GitHub
commit 69bbe24c91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -35,7 +35,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/google/cadvisor v0.49.0
github.com/google/cadvisor v0.49.2
github.com/google/cel-go v0.17.8
github.com/google/gnostic-models v0.6.8
github.com/google/go-cmp v0.6.0

4
go.sum
View File

@ -418,8 +418,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
github.com/google/cadvisor v0.49.0 h1:1PYeiORXmcFYi609M4Qvq5IzcvcVaWgYxDt78uH8jYA=
github.com/google/cadvisor v0.49.0/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
github.com/google/cadvisor v0.49.2 h1:6RGbLCA9sBq9EMqce+M1gefBibz4pQpwX/kODwC+FqM=
github.com/google/cadvisor v0.49.2/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
github.com/google/cel-go v0.17.8 h1:j9m730pMZt1Fc4oKhCLUHfjj6527LuhYcYw0Rl8gqto=
github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=

14
vendor/github.com/google/cadvisor/container/crio/factory.go generated vendored
View File

@ -32,9 +32,6 @@ import (
// The namespace under which crio aliases are unique.
const CrioNamespace = "crio"
// The namespace suffix under which crio aliases are unique.
const CrioNamespaceSuffix = ".scope"
// The namespace systemd runs components under.
const SystemdNamespace = "system-systemd"
@ -117,21 +114,16 @@ func (f *crioFactory) CanHandleAndAccept(name string) (bool, bool, error) {
// TODO(runcom): should we include crio-conmon cgroups?
return false, false, nil
}
if strings.HasPrefix(path.Base(name), SystemdNamespace) {
return true, false, nil
}
if !strings.HasPrefix(path.Base(name), CrioNamespace) {
return false, false, nil
}
if strings.HasPrefix(path.Base(name), SystemdNamespace) {
return true, false, nil
}
// if the container is not associated with CRI-O, we can't handle it or accept it.
if !isContainerName(name) {
return false, false, nil
}
if !strings.HasSuffix(path.Base(name), CrioNamespaceSuffix) {
// this mean it's a sandbox container
return true, false, nil
}
return true, true, nil
}

2
vendor/modules.txt vendored
View File

@ -267,7 +267,7 @@ github.com/golang/protobuf/ptypes/wrappers
# github.com/google/btree v1.0.1
## explicit; go 1.12
github.com/google/btree
# github.com/google/cadvisor v0.49.0
# github.com/google/cadvisor v0.49.2
## explicit; go 1.19
github.com/google/cadvisor/cache/memory
github.com/google/cadvisor/client/v2