fix(kubernetes): make kubepods pattern compatible with qos guaranteed pods (#2357)

Signed-off-by: Laura Llinares <[email protected]>
Co-authored-by: Laura Llinares <[email protected]>

Author: laurall974

internal/resource/container.go

@@ -21,7 +21,7 @@ var (
 	libpodPattern        = regexp.MustCompile(`libpod-([0-9a-f]{64}).*`)
 	libpodPayloadPattern = regexp.MustCompile(`/libpod-payload-([0-9a-f]+)`)
 
-	kubepodsPattern = regexp.MustCompile(`/kubepods/[^/]+/pod[0-9a-f\-]+/([0-9a-f]{64})`)
+	kubepodsPattern = regexp.MustCompile(`/kubepods/(?:[^/]+/)?pod[0-9a-f\-]+/([0-9a-f]{64})`)
 )
 
 // containerPatterns maps pre-compiled patterns to runtime types

internal/resource/container_test.go

@@ -128,6 +128,16 @@ func TestContainerIDFromPathWithCgroup(t *testing.T) {
 		path: "11:blkio:/kubepods/burstable/podf6adb0af-0855-4bab-b25b-c853f18d0ce2/35b97177dada20362ab90d90ac63cd54e8a41cf87bea34f270631b6da17f4a93",
 
 		expected: expect{id: "35b97177dada20362ab90d90ac63cd54e8a41cf87bea34f270631b6da17f4a93", runtime: KubePodsRuntime},
+	}, {
+		name: "valid path with guaranteed qos pod",
+		path: "0::/kubepods/pod51b64565-2b17-4d46-83ac-22e398f2f7fb/65d752a38e1db784d521f48c3f1956f4f9a74ebb923377144f253f3aca9fa028",
+
+		expected: expect{id: "65d752a38e1db784d521f48c3f1956f4f9a74ebb923377144f253f3aca9fa028", runtime: KubePodsRuntime},
+	}, {
+		name: "valid path with burstable qos pod",
+		path: "0::/kubepods/burstable/pod5a89bcaa-3509-4375-83e1-b9e7a5712123/a069581483b00a498b3ba172612ffed06b3275a043bf3895c1b19e783e2793ee",
+
+		expected: expect{id: "a069581483b00a498b3ba172612ffed06b3275a043bf3895c1b19e783e2793ee", runtime: KubePodsRuntime},
 	}, {
 		name: "podman rootless container",
 		path: "0::/user.slice/user-1000.slice/[email protected]/user.slice/libpod-3f05ee050f82c0145f1d88c94269c39dff0f07dbf8bba20aafd54b3a75dcaecc.scope/container",