From 56767001cbc3b6f9097f0843eb5400ab9ffe831c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 17 Jul 2023 15:01:36 +0200 Subject: [PATCH] ci: cri-containerd: Add namespace / uid to the pods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise crictl will fail to remove them with: ``` getting sandbox status of pod "$pod": metadata.Name, metadata.Namespace or metadata.Uid is not in metadata "..." ``` A huge shout out to Steven Horsman for helping to debug this one. Signed-off-by: Fabiano FidĂȘncio --- tests/integration/cri-containerd/integration-tests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 5246621f2..b8c913288 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -167,6 +167,8 @@ function testContainerStart() { cat << EOF > "${pod_yaml}" metadata: name: busybox-sandbox1 + namespace: default + uid: busybox-sandbox1-uid EOF #TestContainerSwap has created its own container_yaml. @@ -174,6 +176,8 @@ EOF cat << EOF > "${container_yaml}" metadata: name: busybox-killed-vmm + namespace: default + uid: busybox-killed-vmm-uid image: image: "$image" command: @@ -318,6 +322,8 @@ function TestContainerSwap() { cat << EOF > "${container_yaml}" metadata: name: busybox-swap + namespace: default + uid: busybox-swap-uid annotations: io.katacontainers.container.resource.swappiness: "100" io.katacontainers.container.resource.swap_in_bytes: "1610612736" @@ -348,6 +354,8 @@ EOF cat << EOF > "${container_yaml}" metadata: name: busybox-swap + namespace: default + uid: busybox-swap-uid annotations: io.katacontainers.container.resource.swappiness: "100" linux: @@ -378,6 +386,8 @@ EOF cat << EOF > "${container_yaml}" metadata: name: busybox-swap + namespace: default + uid: busybox-swap-uid annotations: io.katacontainers.container.resource.swappiness: "100" image: