Skip to content

Commit 7331db0

Browse files
authored
Add other patterns for container ID (#506)
1 parent 991e42d commit 7331db0

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

pkg/components/helpers/container/container.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ var cgroupFormats = []*regexp.Regexp{
4141
// Containerd: /kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod7260904bbd08e72e4dff95d9fccd2ee8.slice/cri-containerd-d36686f9785534531160dc936aec9d711a26eb37f4fc7752a2ae27d0a24345c1.scope
4242
regexp.MustCompile(`^\d+:.*:/kubepods.*([0-9a-f]{64})`),
4343

44+
// formats for other Cgroup v2 implementations
45+
regexp.MustCompile(`^\d+:.*:/k8s\.io/([0-9a-f]{64})`),
46+
4447
// as fallback, other formats for cgroup which might appear in other Docker implementations
4548
// 0::/../../pode039200acb850c82bb901653cc38ff6e/58452031ab6dcaa4fe3ff91f8a46fd41a4a2405586f3cf3d5cb9c93b5bcf62cc
4649
regexp.MustCompile(`^\d+:.*:.*/.*/.*/([0-9a-fA-F]{64})`),

pkg/components/helpers/container/container_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ var fixturesWithContainer = map[uint32]string{
4444
889: `0::/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod7260904bbd08e72e4dff95d9fccd2ee8.slice/cri-containerd-40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9.scope`,
4545
// Docker 27+
4646
899: `0::/../../pode039200acb850c82bb901653cc38ff6e/40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9`,
47+
// Cgroup v2
48+
910: `0::/k8s.io/40c03570b6f4c30bc8d69923d37ee698f5cfcced92c7b7df1c47f6f7887378a9`,
4749
}
4850

4951
var fixturesWithoutContainer = map[uint32]string{

0 commit comments

Comments
 (0)