From 320d445331c630f66b65e663abed4ec62dc86de4 Mon Sep 17 00:00:00 2001 From: Mayank Pande Date: Mon, 7 Apr 2025 14:50:56 +0530 Subject: [PATCH 1/2] fix: fix for invalid container id --- containers/container.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/containers/container.go b/containers/container.go index ca1f9579..8d1706b1 100644 --- a/containers/container.go +++ b/containers/container.go @@ -1,6 +1,7 @@ package containers import ( + "errors" "io" "log" "net/http" @@ -174,6 +175,10 @@ func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, pid // %s -> pod name split := strings.Split(string(id), "/") + if len(split) != 4 { + klog.Errorf("unexpected container id %s", id) + return nil, errors.New("unexpected container id") + } namespace := split[2] podName := split[3] src_workload := registry.ip_resolver.ResolvePodOwner(podName, namespace) From 0d80ec82840d28beedc4baeab20fdbc6f308e310 Mon Sep 17 00:00:00 2001 From: Mayank Pande Date: Tue, 8 Apr 2025 10:05:15 +0530 Subject: [PATCH 2/2] fix: fix for container id parsing --- containers/container.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/containers/container.go b/containers/container.go index 8d1706b1..9eea78f3 100644 --- a/containers/container.go +++ b/containers/container.go @@ -170,12 +170,8 @@ func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, pid return nil, err } defer netNs.Close() - // /k8s/%s/%s/%s split - // /k8s/ -> namespace - // %s -> pod name - split := strings.Split(string(id), "/") - if len(split) != 4 { + if len(split) < 4 { klog.Errorf("unexpected container id %s", id) return nil, errors.New("unexpected container id") }