From 62c68a405147bd0dcadfe673ee59066a4bb2bf7a Mon Sep 17 00:00:00 2001 From: GregoireW <24318548+GregoireW@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:58:34 +0200 Subject: [PATCH] Pull tcpdump image with ctr instead of crictl --- pkg/service/sniffer/runtime/containerd.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/service/sniffer/runtime/containerd.go b/pkg/service/sniffer/runtime/containerd.go index c41b34b..91d2607 100644 --- a/pkg/service/sniffer/runtime/containerd.go +++ b/pkg/service/sniffer/runtime/containerd.go @@ -40,10 +40,12 @@ func (d *ContainerdBridge) BuildTcpdumpCommand(containerId *string, netInterface export CONTAINERD_NAMESPACE="k8s.io" export CONTAINER_RUNTIME_ENDPOINT="unix:///host${CONTAINERD_SOCKET}" export IMAGE_SERVICE_ENDPOINT=${CONTAINER_RUNTIME_ENDPOINT} - crictl pull %s >/dev/null netns=$(crictl inspect %s | jq '.info.runtimeSpec.linux.namespaces[] | select(.type == "network") | .path' | tr -d '"') - exec chroot /host ctr -a ${CONTAINERD_SOCKET} run --rm --with-ns "network:${netns}" %s %s %s - `, d.socketPath, tcpdumpImage, *containerId, tcpdumpImage, d.tcpdumpContainerName, tcpdumpCommand) + cat < /dev/null + ctr -a ${CONTAINERD_SOCKET} run --rm --with-ns "network:${netns}" %s %s %s + EOF + `, d.socketPath, *containerId, tcpdumpImage, tcpdumpImage, d.tcpdumpContainerName, tcpdumpCommand) command := []string{"/bin/sh", "-c", shellScript} return command }