From 9ab6ab98973b1e1232bf8103a3ba78c4ac277cca Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Thu, 27 Mar 2025 12:51:19 +0900 Subject: [PATCH] kata-deploy: Fix kata-cleanup's CrashLoopBackOff Since kata-deploy.sh references an undefined variable, kata-cleanup.yaml enters a CrashLoopBackOff state. ``` $ kubectl apply -f https://raw.githubusercontent.com/kata-containers/kata-containers/main/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml daemonset.apps/kubelet-kata-cleanup created $ kubectl get pods -n kube-system kubelet-kata-cleanup-zzbd2 0/1 CrashLoopBackOff 3 (33s ago) 80s $ kubectl logs -n kube-system daemonsets/kubelet-kata-cleanup /opt/kata-artifacts/scripts/kata-deploy.sh: line 19: SHIMS: unbound variable ``` Therefore, set an initial value for the environment variables. Fixes: #11083 Signed-off-by: Shunsuke Kimura --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 33c47de18..2d037fe84 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -16,8 +16,16 @@ containerd_conf_file_backup="${containerd_conf_file}.bak" containerd_conf_tmpl_file="" use_containerd_drop_in_conf_file="false" +DEBUG="${DEBUG:-"false"}" + +SHIMS="${SHIMS:-"clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-sev qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"}" IFS=' ' read -a shims <<< "$SHIMS" +DEFAULT_SHIM="${DEFAULT_SHIM:-"qemu"}" default_shim="$DEFAULT_SHIM" + +CREATE_RUNTIMECLASSES="${CREATE_RUNTIMECLASSES:-"false"}" +CREATE_DEFAULT_RUNTIMECLASS="${CREATE_DEFAULT_RUNTIMECLASS:-"false"}" + ALLOWED_HYPERVISOR_ANNOTATIONS="${ALLOWED_HYPERVISOR_ANNOTATIONS:-}" IFS=' ' read -a non_formatted_allowed_hypervisor_annotations <<< "$ALLOWED_HYPERVISOR_ANNOTATIONS"