github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-26 07:30:19 +00:00
Code Issues Projects Releases Wiki Activity

tests: use OCI 1.3.0 policy drop-in for k0s

Browse Source 
k0s ships a recent containerd that emits OCI runtime spec 1.3.0, matching
k3s and rke2. Route k0s through the same 20-oci-1.3.0 genpolicy drop-in
so auto-generated agent policies match the bundle version the runtime sends.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
Assisted-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Fabiano Fidêncio
2026-07-12 09:10:06 +02:00
parent 8f78b4f50c
commit 94f21c111d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ Drop-ins are layered: `10-*` files set the platform base, `20-*` files overlay O
| `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 |
| `20-oci-1.2.1-drop-in.json` | OCI bundle version 1.2.1 (e.g. microk8s, CBL-Mariner) |
| `20-oci-1.3.0-drop-in.json` | OCI bundle version 1.3.0 (e.g. containerd 2.2.x) |
| `20-oci-1.3.0-drop-in.json` | OCI bundle version 1.3.0 (e.g. k0s, k3s, rke2, containerd 2.2.x) |
| `20-experimental-force-guest-pull-drop-in.json` | Disable guest pull |
Request/exec overrides (e.g. allowing `kubectl exec` or specific ttRPC requests) are not shipped as drop-in examples; build your own drop-in or merge the needed `request_defaults` into a local file in `genpolicy-settings.d/`.

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

@@ -108,7 +108,7 @@ is_aks_cluster() {
is_k3s_or_rke2() {
case "${KUBERNETES:-}" in
k3s|rke2) return 0 ;;
k0s|k3s|rke2) return 0 ;;
*) return 1 ;;
esac
}