From b18c3dfce385a9fd33c028f6ee7f9d36108aab5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 21 Aug 2024 00:07:20 +0200 Subject: [PATCH] Revert "kata-deploy: Add Helm Chart" (partially) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This partially reverts commit 94b3348d3cd2e85a87214829806faf921a928d32, as there's more work needed in order to have this one done in a robust way, and we are taking the safer path of reverting for now, and adding it back as soon as the release is cut out. Signed-off-by: Fabiano Fidêncio --- tests/integration/kubernetes/gha-run.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index ca0f1a34ea..bb80032a85 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -191,8 +191,12 @@ function deploy_kata() { fi if [ "${KATA_HOST_OS}" = "cbl-mariner" ]; then - ALLOWED_HYPERVISOR_ANNOTATIONS="initrd kernel default_vcpus" - HOST_OS=${KATA_HOST_OS} + yq -i \ + '.spec.template.spec.containers[0].env[6].value = "initrd kernel default_vcpus"' \ + "${tools_dir}/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml" + yq -i \ + ".spec.template.spec.containers[0].env += [{\"name\": \"HOST_OS\", \"value\": \"${KATA_HOST_OS}\"}]" \ + "${tools_dir}/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml" fi if [ "${KATA_HYPERVISOR}" = "qemu" ]; then