github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-16 16:32:03 +00:00
Code Issues Projects Releases Wiki Activity

tests/k8s: kbs: Update overlays logic

Browse Source 
In https://github.com/confidential-containers/trustee/pull/521
the overlays logic was modified to add non-SE
s390x support and simplify non-ibm-se platforms.
We need to update the logic in `kbs_k8s_deploy`
to match and can remove the dummying of `IBM_SE_CREDS_DIR`
for non-SE now

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2024-10-09 09:34:14 +01:00
parent 80196c06ad
commit 8763880e93
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,8 +227,10 @@ 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
kubectl delete -k config/kubernetes/overlays/ibm-se
else
kubectl delete -k config/kubernetes/overlays/$(uname -m)
kubectl delete -k config/kubernetes/overlays/
fi
# Verify that KBS namespace resources were properly deleted
@ -294,22 +296,15 @@ function kbs_k8s_deploy() {
# Tests should fill kbs resources later, however, the deployment
# expects at least one secret served at install time.
echo "somesecret" > overlays/$(uname -m)/key.bin
echo "somesecret" > overlays/key.bin
# For qemu-se runtime, prepare the necessary resources
if [ "$(uname -m)" == "s390x" ]; then
if [ "${KATA_HYPERVISOR}" == "qemu-se" ]; then
mv overlays/key.bin overlays/ibm-se/key.bin
prepare_credentials_for_qemu_se
elif [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ]; then
# Create an empty directory just for deployment
export IBM_SE_CREDS_DIR="$(mktemp -d -t ibmse.creds.XXXXXXXXXX)"
else
echo "ERROR: KBS deployment for ${KATA_HYPERVISOR} is not supported" >&2
return 1
fi
# SE_SKIP_CERTS_VERIFICATION should be set to true
# to skip the verification of the certificates
sed -i "s/false/true/g" overlays/s390x/patch.yaml
sed -i "s/false/true/g" overlays/ibm-se/patch.yaml
fi
echo "::group::Update the kbs container image"
@ -519,7 +514,7 @@ _handle_ingress_aks() {
return 1
fi
pushd "${COCO_KBS_DIR}/config/kubernetes/overlays/common"
pushd "${COCO_KBS_DIR}/config/kubernetes/overlays/"
echo "::group::$(pwd)/ingress.yaml"
KBS_INGRESS_CLASS="addon-http-application-routing" \