From 94f21c111d7a6d91d4d65253bb3ceeda4b4e6296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sun, 12 Jul 2026 09:10:06 +0200 Subject: [PATCH] tests: use OCI 1.3.0 policy drop-in for k0s MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Assisted-by: Cursor --- src/tools/genpolicy/drop-in-examples/README.md | 2 +- tests/integration/kubernetes/tests_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/genpolicy/drop-in-examples/README.md b/src/tools/genpolicy/drop-in-examples/README.md index 0d694fca37..e1b39c33a4 100644 --- a/src/tools/genpolicy/drop-in-examples/README.md +++ b/src/tools/genpolicy/drop-in-examples/README.md @@ -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/`. diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 529c6b9233..9328e4c1b2 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -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 }