cri-o Switch to libexecdir (#11584)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

roles/container-engine/cri-o/defaults/main.yml

@@ -2,6 +2,7 @@
 
 crio_cgroup_manager: "{{ kubelet_cgroup_driver | default('systemd') }}"
 crio_conmon: "{{ bin_dir }}/conmon"
+crio_libexec_dir: "/usr/libexec/crio"
 crio_enable_metrics: false
 crio_log_level: "info"
 crio_metrics_port: "9090"
@@ -40,7 +41,7 @@ crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<m
 # The crio_runtimes variable defines a list of OCI compatible runtimes.
 crio_runtimes:
   - name: runc
-    path: "{{ bin_dir }}/runc"
+    path: "{{ crio_runtime_bin_dir }}/runc"
     type: oci
     root: /run/runc
 
@@ -58,7 +59,7 @@ kata_runtimes:
 # crun is a fast and low-memory footprint OCI Container Runtime fully written in C.
 crun_runtime:
   name: crun
-  path: "{{ bin_dir }}/crun"
+  path: "{{ crio_runtime_bin_dir }}/crun"
   type: oci
   root: /run/crun
 

roles/container-engine/cri-o/tasks/main.yaml

@@ -82,6 +82,23 @@
     - "{{ crio_bin_files }}"
   notify: Restart crio
 
+- name: Cri-o | create directory for libexec
+  file:
+    path: "{{ crio_libexec_dir }}"
+    state: directory
+    owner: root
+    mode: "0755"
+
+- name: Cri-o | copy libexec
+  copy:
+    src: "{{ local_release_dir }}/cri-o/bin/{{ item }}"
+    dest: "{{ crio_libexec_dir }}/{{ item }}"
+    mode: "0755"
+    remote_src: true
+  with_items:
+    - "{{ crio_libexec_files }}"
+  notify: Restart crio
+
 - name: Cri-o | copy service file
   copy:
     src: "{{ local_release_dir }}/cri-o/contrib/crio.service"

roles/container-engine/cri-o/tasks/reset.yml

@@ -88,3 +88,11 @@
   with_items: "{{ crio_bin_files }}"
   tags:
     - reset_crio
+
+- name: CRI-O | Remove CRI-O libexec
+  file:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ crio_libexec_files }}"
+  tags:
+    - reset_crio

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

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:

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

roles/container-engine/youki/tasks/main.yml

@@ -6,7 +6,7 @@
 
 - name: Youki | Copy youki binary from download dir
   copy:
-    src: "{{ local_release_dir }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux/youki-{{ youki_version }}/youki"
+    src: "{{ local_release_dir }}/youki"
     dest: "{{ youki_bin_dir }}/youki"
     mode: "0755"
     remote_src: true