From cf5d3ed0d43ad323a03233c75ac3934e4140cb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 10 Oct 2024 09:59:37 +0200 Subject: [PATCH] kbs: ita: Ensure the proper image / image_tag is used for ITA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When dealing with a specific release, it was easier to just do some adjustments on the image that has to be used for ITA without actually adding a new entry in the versions.yaml. However, it's been proven to be more complicated than that when it comes to dealing with staged images, and we better explicitly add (and update) those versions altogether to avoid CI issues. Signed-off-by: Fabiano Fidêncio --- tests/integration/kubernetes/confidential_kbs.sh | 5 ++--- versions.yaml | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/integration/kubernetes/confidential_kbs.sh b/tests/integration/kubernetes/confidential_kbs.sh index c7cfc66683..e8685d2dd9 100644 --- a/tests/integration/kubernetes/confidential_kbs.sh +++ b/tests/integration/kubernetes/confidential_kbs.sh @@ -266,9 +266,8 @@ function kbs_k8s_deploy() { # Image tag for TDX if [ "${KATA_HYPERVISOR}" = "qemu-tdx" ]; then - # The ITA / ITTS images are named as: - # ita-as-${image_tag} - image_tag=$(echo ${image_tag} | sed 's/built-in/ita/g') + image=$(get_from_kata_deps ".externals.coco-trustee.ita_image") + image_tag=$(get_from_kata_deps ".externals.coco-trustee.ita_image_tag") fi # The ingress handler for AKS relies on the cluster's name which in turn diff --git a/versions.yaml b/versions.yaml index 121b86fbfa..5798e4339e 100644 --- a/versions.yaml +++ b/versions.yaml @@ -238,8 +238,11 @@ externals: description: "Provides attestation and secret delivery components" url: "https://github.com/confidential-containers/trustee" version: "f287fcd60b0b3ddbef5546d646669813b9e68f8d" + # image / ita_image and image_tag / ita_image_tag must be in sync image: "ghcr.io/confidential-containers/staged-images/kbs" image_tag: "f287fcd60b0b3ddbef5546d646669813b9e68f8d" + ita_image: "ghcr.io/confidential-containers/staged-images/kbs-ita-as" + ita_image_tag: "f287fcd60b0b3ddbef5546d646669813b9e68f8d-x86_64" toolchain: "1.74.0" crio: