Skip to content

Pull tcpdump image with ctr instead of crictl #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GregoireW wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pull tcpdump image with ctr instead of crictl #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c68a4
Pull tcpdump image with ctr instead of crictl
GregoireW Jun 10, 2024
2fc8bf3
Replace docker image to have crictl 1.35
GregoireW Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/kubectl-sniff
/kubectl-sniff-darwin
/kubectl-sniff-darwin-arm64
/kubectl-sniff-windows
14 changes: 8 additions & 6 deletions pkg/service/sniffer/runtime/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

type ContainerdBridge struct {
tcpdumpContainerName string
socketPath string
socketPath string
}

func NewContainerdBridge() *ContainerdBridge {
Expand Down Expand Up @@ -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 <<EOF | exec chroot /host
ctr image pull %s > /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
}
Expand All @@ -61,9 +63,9 @@ func (d *ContainerdBridge) BuildCleanupCommand() []string {
}

func (d ContainerdBridge) GetDefaultImage() string {
return "docker.io/hamravesh/ksniff-helper:v3"
return "docker.io/gregoirew/ksniff-helper:release"
}

func (d *ContainerdBridge) GetDefaultTCPImage() string {
return "docker.io/maintained/tcpdump:latest"
}
}