cri-o Switch to libexecdir (#11584)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
2026-05-08 18:07:39 -02:30 · 2024-09-30 15:34:03 +08:00
parent 0eeac591ad
commit fcbcf3c03b
9 changed files with 52 additions and 20 deletions
--- a/roles/container-engine/cri-o/vars/v1.28.yml
+++ b/roles/container-engine/cri-o/vars/v1.28.yml
@@ -1,4 +1,6 @@
 ---
+crio_runtime_bin_dir: "{{ bin_dir }}"
+
 # cri-o binary files
 crio_bin_files:
  - conmon
--- a/roles/container-engine/cri-o/vars/v1.29.yml
+++ b/roles/container-engine/cri-o/vars/v1.29.yml
@@ -1,5 +1,6 @@
 ---
 crio_conmon: "{{ bin_dir }}/crio-conmon"
+crio_runtime_bin_dir: "{{ bin_dir }}"

 # cri-o binary files
 crio_bin_files:
--- a/roles/container-engine/cri-o/vars/v1.31.yml
+++ b/roles/container-engine/cri-o/vars/v1.31.yml
@@ -1,13 +1,16 @@
 ---
-crio_conmon: "{{ bin_dir }}/conmon"
+crio_conmon: "{{ crio_libexec_dir }}/conmon"
+crio_runtime_bin_dir: "{{ crio_libexec_dir }}"

 # cri-o binary files
 crio_bin_files:
+  - crio
+  - pinns
+
+crio_libexec_files:
  - conmon
  - conmonrs
  - crun
  - runc
-  - crio
-  - pinns

 crio_status_command: crio status