mirror of
https://github.com/kata-containers/kata-containers.git
synced 2026-07-14 04:51:43 +00:00
f7878cc385
Docker 26+ configures container networking (veth pair, IP addresses, routes) after task creation rather than before. Kata's endpoint scan runs during CreateSandbox, before the interfaces exist, resulting in VMs starting without network connectivity (no -netdev passed to QEMU). Add RescanNetwork() which runs asynchronously after the Start RPC. It polls the network namespace until Docker's interfaces appear, then hotplugs them to QEMU and informs the guest agent to configure them inside the VM. Additional fixes: - mountinfo parser: find fs type dynamically instead of hardcoded field index, fixing parsing with optional mount tags (shared:, master:) - IsDockerContainer: check CreateRuntime hooks for Docker 26+ - DockerNetnsPath: extract netns path from libnetwork-setkey hook args with path traversal protection - detectHypervisorNetns: verify PID ownership via /proc/pid/cmdline to guard against PID recycling - startVM guard: rescan when len(endpoints)==0 after VM start Fixes: #9340 Signed-off-by: llink5 <llink5@users.noreply.github.com>
46 lines
1.1 KiB
Bash
Executable File
46 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (c) 2023 Intel Corporation
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
set -o errexit
|
|
set -o nounset
|
|
set -o pipefail
|
|
|
|
kata_tarball_dir="${2:-kata-artifacts}"
|
|
docker_dir="$(dirname "$(readlink -f "$0")")"
|
|
source "${docker_dir}/../../common.bash"
|
|
image="${image:-instrumentisto/nmap:latest}"
|
|
|
|
function install_dependencies() {
|
|
info "Installing the dependencies needed for running the docker smoke test"
|
|
|
|
sudo -E docker pull "${image}"
|
|
}
|
|
|
|
function run() {
|
|
info "Running docker smoke test tests using ${KATA_HYPERVISOR} hypervisor"
|
|
|
|
enabling_hypervisor
|
|
|
|
info "Running docker with runc"
|
|
sudo docker run --rm --entrypoint nping "${image}" --tcp-connect -c 2 -p 80 www.github.com
|
|
|
|
info "Running docker with Kata Containers (${KATA_HYPERVISOR})"
|
|
sudo docker run --rm --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 --entrypoint nping "${image}" --tcp-connect -c 2 -p 80 www.github.com
|
|
}
|
|
|
|
function main() {
|
|
action="${1:-}"
|
|
case "${action}" in
|
|
install-dependencies) install_dependencies ;;
|
|
install-kata) install_kata ;;
|
|
run) run ;;
|
|
*) >&2 die "Invalid argument" ;;
|
|
esac
|
|
}
|
|
|
|
main "$@"
|