github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-25 22:49:59 +00:00
Code Issues Projects Releases Wiki Activity

versions: deduplicate coco-trustee container image pins

Browse Source 
Store trustee image repositories once under images.* and derive tags
from version, updating the KBS deployment test to match.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
This commit is contained in:
Fabiano Fidêncio
2026-07-14 11:17:31 +02:00
parent 4f35220a24
commit f09fc011ce
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,9 +407,9 @@ function kbs_k8s_deploy() {
# Read from versions.yaml
repo=$(get_from_kata_deps ".externals.coco-trustee.url")
version=$(get_from_kata_deps ".externals.coco-trustee.version")
image_kbs=$(get_from_kata_deps ".externals.coco-trustee.image_kbs")
image_as=$(get_from_kata_deps ".externals.coco-trustee.image_as")
image_rvps=$(get_from_kata_deps ".externals.coco-trustee.image_rvps")
image_kbs=$(get_from_kata_deps ".externals.coco-trustee.images.kbs")
image_as=$(get_from_kata_deps ".externals.coco-trustee.images.as")
image_rvps=$(get_from_kata_deps ".externals.coco-trustee.images.rvps")
# 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
@@ -432,14 +432,13 @@ function kbs_k8s_deploy() {
popd
echo "::endgroup::"
# Split image references into repository and tag.
# Format is "repo:tag" (e.g. "ghcr.io/confidential-containers/staged-images/kbs-grpc-as:<sha>")
local kbs_repo="${image_kbs%:*}"
local kbs_tag="${image_kbs##*:}"
local as_repo="${image_as%:*}"
local as_tag="${image_as##*:}"
local rvps_repo="${image_rvps%:*}"
local rvps_tag="${image_rvps##*:}"
# Image tags match the trustee source version.
local kbs_repo="${image_kbs}"
local kbs_tag="${version}"
local as_repo="${image_as}"
local as_tag="${version}"
local rvps_repo="${image_rvps}"
local rvps_tag="${version}"
# Build Helm --set arguments for verifier configuration.
# These supplement the values file and avoid embedding YAML inside the heredoc.

14
versions.yaml
View File

@@ -294,16 +294,12 @@ externals:
description: "Provides attestation and secret delivery components"
url: "https://github.com/confidential-containers/trustee"
version: "258ea4acb7b9bd865fce5c63a539f2120dba8298"
# image and image_tag must be in sync
image: "ghcr.io/confidential-containers/staged-images/kbs"
image_tag: "258ea4acb7b9bd865fce5c63a539f2120dba8298"
toolchain: "1.90.0"
# Helm chart deploys three separate images (kbs, as, rvps)
# yamllint disable rule:line-length
image_kbs: "ghcr.io/confidential-containers/staged-images/kbs-grpc-as:258ea4acb7b9bd865fce5c63a539f2120dba8298"
image_as: "ghcr.io/confidential-containers/staged-images/coco-as-grpc:258ea4acb7b9bd865fce5c63a539f2120dba8298"
image_rvps: "ghcr.io/confidential-containers/staged-images/rvps:258ea4acb7b9bd865fce5c63a539f2120dba8298"
# yamllint enable rule:line-length
# Helm chart deploys three separate images; tags match version.
images:
kbs: "ghcr.io/confidential-containers/staged-images/kbs-grpc-as"
as: "ghcr.io/confidential-containers/staged-images/coco-as-grpc"
rvps: "ghcr.io/confidential-containers/staged-images/rvps"
containerd:
description: |