fix(container): Improve container ID detection using deepest cgroup path match for nested containerIDs in cgroup path #2119
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## reboot #2119 +/- ##
==========================================
- Coverage 92.63% 92.56% -0.08%
==========================================
Files 33 33
Lines 2553 2582 +29
==========================================
+ Hits 2365 2390 +25
- Misses 149 152 +3
- Partials 39 40 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
vimalk78
force-pushed
the
containerID-for-kind
branch
from
dc1a471 to
c537458
Compare
|
Thanks a lot @vimalk78 ! lgtm but CI is failing. Question. if we want the deepest scope, how about we separate each segment by |
sthaha
reviewed
Jun 2, 2025
go.mod
Outdated
Comment on lines
3
to
5
| go 1.23 | ||
|
|
||
| toolchain go1.23.3 |
There was a problem hiding this comment.
Nice! wondering if you ran go mod tidy?
vimalk78
force-pushed
the
containerID-for-kind
branch
from
c537458 to
5d355d0
Compare
|
/retest |
…match If multiple container IDs are found within a single cgroup path, the changed function prioritizes the one appearing furthest to the right or "deepest" in the path string. e.g. for a pod created in kind cluster, the cgroup path for the process running in pod is typically like below: 0::/system.slice/docker-fd9d0ea06257a9780827cbc7fd92e3812a54fca26d63e191b73610d5d48b9cbd.scope/kubelet.slice/kubelet-kubepods.slice/kubelet-kubepods-besteffort.slice/kubelet-kubepods-besteffort-podeab5a334_93fe_48a8_b139_9e8079c1f163.slice/cri-containerd-99f3a16ea25b7724cb56a4f0c0df1113ad9474fbf5545bead97fd5c7f61c13f4.scope the first container (docker) refers to the kind node the second container (cri-containerd) refers to the container running as part of the pod this commit will return the second container id. Signed-off-by: Vimal Kumar <[email protected]>
vimalk78
force-pushed
the
containerID-for-kind
branch
from
5d355d0 to
c46f84f
Compare
sthaha
approved these changes
Jun 2, 2025
sthaha
merged commit 32d60d5
into
sustainable-computing-io:reboot
11 of 12 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR improves container ID detection using deepest cgroup path match for nested containerIDs in cgroup path, typical in kind cluster.
If multiple container IDs are found within a single cgroup path, the changed function prioritizes the one appearing furthest to the right or "deepest" in the path string.
e.g. for a pod created in kind cluster, the cgroup path for the process running in pod is typically like below:
the first container (docker) refers to the kind node
the second container (cri-containerd) refers to the container running as part of the pod
this commit will return the second container id