github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-05-18 13:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12980 from microsoft/danmihai1/mariner-oci-version

Browse Source 
ci: mariner: use OCI version 1.2.1
This commit is contained in:
Fabiano Fidêncio
2026-05-05 08:10:03 +02:00
committed by GitHub
parent 76d815dc67 0a6dc2fae0
commit 03f36e391e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/genpolicy/drop-in-examples/README.md
View File

@@ -23,8 +23,8 @@ Drop-ins are layered: `10-*` files set the platform base, `20-*` files overlay O
| `10-non-coco-drop-in.json` | Non-confidential guest (e.g. standard VMs) |
| `10-non-coco-aks-drop-in.json` | Non-confidential guest on AKS |
| `10-non-coco-aks-cbl-mariner-drop-in.json` | Non-confidential guest on AKS with CBL-Mariner host |
| `20-oci-1.2.0-drop-in.json` | OCI bundle version 1.2.0 (e.g. CBL-Mariner) |
| `20-oci-1.2.1-drop-in.json` | OCI bundle version 1.2.1 (e.g. k3s, rke2, NVIDIA GPU) |
| `20-oci-1.2.0-drop-in.json` | OCI bundle version 1.2.0 |
| `20-oci-1.2.1-drop-in.json` | OCI bundle version 1.2.1 (e.g. k3s, rke2, NVIDIA GPU, CBL-Mariner) |
| `20-oci-1.3.0-drop-in.json` | OCI bundle version 1.3.0 (e.g. containerd 2.2.x) |
| `20-experimental-force-guest-pull-drop-in.json` | Disable guest pull |

2
tests/integration/kubernetes/tests_common.sh
View File

@@ -151,7 +151,7 @@ install_genpolicy_drop_ins() {
# 20-* OCI version overlay
if [[ "${KATA_HOST_OS:-}" == "cbl-mariner" ]]; then
cp "${examples_dir}/20-oci-1.2.0-drop-in.json" "${settings_d}/"
cp "${examples_dir}/20-oci-1.2.1-drop-in.json" "${settings_d}/"
elif is_k3s_or_rke2 || is_nvidia_gpu_platform || is_snp_hypervisor "${KATA_HYPERVISOR}" || is_tdx_hypervisor "${KATA_HYPERVISOR}" || [[ -n "${CONTAINER_ENGINE_VERSION:-}" ]] || is_arm64_host; then
cp "${examples_dir}/20-oci-1.3.0-drop-in.json" "${settings_d}/"
fi