From 784bf36c66b4c9b676a299578dcc075e1b6d443f Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Tue, 8 Jul 2025 22:37:27 +0900 Subject: [PATCH] fix: Use crun in the cri-o distribution and don't use crun role from cri-o role anymore (#12289) Signed-off-by: Takuya Murakami --- roles/container-engine/cri-o/defaults/main.yml | 2 +- roles/container-engine/cri-o/meta/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index 4de3b1781..b7e34654b 100644 --- a/roles/container-engine/cri-o/defaults/main.yml +++ b/roles/container-engine/cri-o/defaults/main.yml @@ -44,7 +44,7 @@ crio_root: "/var/lib/containers/storage" # The crio_runtimes variable defines a list of OCI compatible runtimes. crio_runtimes: - name: crun - path: "{{ crio_runtime_bin_dir }}/crun" + path: "{{ crio_runtime_bin_dir }}/crun" # Use crun in cri-o distributions, don't use 'crun' role type: oci root: /run/crun diff --git a/roles/container-engine/cri-o/meta/main.yml b/roles/container-engine/cri-o/meta/main.yml index 99e803a51..5289208fb 100644 --- a/roles/container-engine/cri-o/meta/main.yml +++ b/roles/container-engine/cri-o/meta/main.yml @@ -1,5 +1,4 @@ --- dependencies: - - role: container-engine/crun - role: container-engine/crictl - role: container-engine/skopeo