github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-05-03 02:10:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12918 from mythi/no-ita

Browse Source 
tests: align qemu-tdx kbs tests to use Trustee AS
This commit is contained in:
Fabiano Fidêncio
2026-04-26 13:13:59 +02:00
committed by GitHub
parent 815db4a1df 9cccfb5cb5
commit 120d895d60
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/integration/kubernetes/confidential_kbs.sh
View File

@@ -19,7 +19,6 @@ source "${kubernetes_dir}/../../../tools/packaging/guest-image/lib_se.sh"
export PATH="${PATH}:/opt/kata/bin"
KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}"
ITA_KEY="${ITA_KEY:-}"
HTTPS_PROXY="${HTTPS_PROXY:-}"
# Where the trustee (includes kbs) sources will be cloned
readonly COCO_TRUSTEE_DIR="/tmp/trustee"
@@ -320,9 +319,7 @@ ensure_snphost() {
#
function kbs_k8s_delete() {
pushd "${COCO_KBS_DIR}"
if [[ "${KATA_HYPERVISOR}" = "qemu-tdx" ]]; then
kubectl delete -k config/kubernetes/ita
elif [[ "${KATA_HYPERVISOR}" = qemu-se* ]]; then
if [[ "${KATA_HYPERVISOR}" = qemu-se* ]]; then
kubectl delete -k config/kubernetes/overlays/ibm-se
else
kubectl delete -k config/kubernetes/overlays/
@@ -359,12 +356,6 @@ function kbs_k8s_deploy() {
image=$(get_from_kata_deps ".externals.coco-trustee.image")
image_tag=$(get_from_kata_deps ".externals.coco-trustee.image_tag")
# Image tag for TDX
if [[ "${KATA_HYPERVISOR}" = "qemu-tdx" ]]; then
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
# contain the HEAD commit of the kata-containers repository (supposedly the
# current directory). It will be needed to save the cluster's name before
@@ -411,14 +402,6 @@ function kbs_k8s_deploy() {
echo "::group::Deploy the KBS"
if [[ "${KATA_HYPERVISOR}" = "qemu-tdx" ]]; then
echo "::group::Setting up ITA/ITTS for TDX"
pushd "${COCO_KBS_DIR}/config/kubernetes/ita/"
# Let's replace the "tBfd5kKX2x9ahbodKV1..." sample
# `api_key`property by a valid ITA/ITTS API key, in the
# ITA/ITTS specific configuration
sed -i -e "s/tBfd5kKX2x9ahbodKV1.../${ITA_KEY}/g" kbs-config.toml
popd
if [[ -n "${HTTPS_PROXY}" ]]; then
# Ideally this should be something kustomizable on trustee side.
#
@@ -431,8 +414,6 @@ function kbs_k8s_deploy() {
yq e ".spec.template.spec.containers[0].env += [{\"name\": \"https_proxy\", \"value\": \"${HTTPS_PROXY}\"}]" -i deployment.yaml
popd
fi
export DEPLOYMENT_DIR=ita
fi
./deploy-kbs.sh

4
versions.yaml
View File

@@ -299,11 +299,9 @@ externals:
description: "Provides attestation and secret delivery components"
url: "https://github.com/confidential-containers/trustee"
version: "22788122660d6e9be3e4bf52704282de5fcc0a2a"
# image / ita_image and image_tag / ita_image_tag must be in sync
# image and image_tag must be in sync
image: "ghcr.io/confidential-containers/staged-images/kbs"
image_tag: "22788122660d6e9be3e4bf52704282de5fcc0a2a"
ita_image: "ghcr.io/confidential-containers/staged-images/kbs-ita-as"
ita_image_tag: "22788122660d6e9be3e4bf52704282de5fcc0a2a-x86_64"
toolchain: "1.90.0"
containerd: