File tree Expand file tree Collapse file tree 2 files changed +5
-0
lines changed
pkg/components/helpers/container Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -41,6 +41,9 @@ var cgroupFormats = []*regexp.Regexp{
41
41
// Containerd: /kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod7260904bbd08e72e4dff95d9fccd2ee8.slice/cri-containerd-d36686f9785534531160dc936aec9d711a26eb37f4fc7752a2ae27d0a24345c1.scope
42
42
regexp .MustCompile (`^\d+:.*:/kubepods.*([0-9a-f]{64})` ),
43
43
44
+ // formats for other Cgroup v2 implementations
45
+ regexp .MustCompile (`^\d+:.*:/k8s\.io/([0-9a-f]{64})` ),
46
+
44
47
// as fallback, other formats for cgroup which might appear in other Docker implementations
45
48
// 0::/../../pode039200acb850c82bb901653cc38ff6e/58452031ab6dcaa4fe3ff91f8a46fd41a4a2405586f3cf3d5cb9c93b5bcf62cc
46
49
regexp .MustCompile (`^\d+:.*:.*/.*/.*/([0-9a-fA-F]{64})` ),
Original file line number Diff line number Diff line change @@ -44,6 +44,8 @@ var fixturesWithContainer = map[uint32]string{
44
44
889 : `0::/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod7260904bbd08e72e4dff95d9fccd2ee8.slice/cri-containerd-40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9.scope` ,
45
45
// Docker 27+
46
46
899 : `0::/../../pode039200acb850c82bb901653cc38ff6e/40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9` ,
47
+ // Cgroup v2
48
+ 910 : `0::/k8s.io/40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9` ,
47
49
}
48
50
49
51
var fixturesWithoutContainer = map [uint32 ]string {
You can’t perform that action at this time.
0 commit comments