tests: k8s: address PR review feedback

1. Rename install_kata_common to install_kata_core.

2. Add TODO for better way to install the Kata tools.

Signed-off-by: Dan Mihai <dmihai@microsoft.com>
This commit is contained in:
Dan Mihai 2024-02-06 20:32:41 +00:00
parent dd16bc393f
commit 6b5e57f7c7
2 changed files with 6 additions and 4 deletions

View File

@ -371,7 +371,7 @@ log_level = "debug"
EOF
}
function install_kata_common() {
function install_kata_core() {
declare -r katadir="$1"
declare -r destdir="/"
declare -r kata_tarball="kata-static.tar.xz"
@ -386,14 +386,16 @@ function install_kata_common() {
function install_kata_tools() {
declare -r katadir="/opt/kata"
install_kata_common "${katadir}"
# TODO: implement a better way to install the tools - see issue #8864.
install_kata_core "${katadir}"
}
function install_kata() {
declare -r katadir="/opt/kata"
declare -r local_bin_dir="/usr/local/bin/"
install_kata_common "${katadir}"
install_kata_core "${katadir}"
# create symbolic links to kata components
for b in "${katadir}"/bin/* ; do

View File

@ -24,8 +24,8 @@ KATA_DEPLOY_WAIT_TIMEOUT=${KATA_DEPLOY_WAIT_TIMEOUT:-10m}
KATA_HYPERVISOR=${KATA_HYPERVISOR:-qemu}
KUBERNETES="${KUBERNETES:-}"
SNAPSHOTTER="${SNAPSHOTTER:-}"
export TEST_CLUSTER_NAMESPACE="${TEST_CLUSTER_NAMESPACE:-kata-containers-k8s-tests}"
export AUTO_GENERATE_POLICY="${AUTO_GENERATE_POLICY:-no}"
export TEST_CLUSTER_NAMESPACE="${TEST_CLUSTER_NAMESPACE:-kata-containers-k8s-tests}"
function configure_devmapper() {
sudo mkdir -p /var/lib/containerd/devmapper