diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index ffbb0cfb26b..5525790d174 100644 --- a/roles/container-engine/cri-o/defaults/main.yml +++ b/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_default_runtime: "crun" crio_libexec_dir: "/usr/libexec/crio" crio_enable_metrics: false crio_log_level: "info" @@ -40,10 +41,10 @@ crio_required_version: "{{ kube_version | regex_replace('^v(?P\\d+).(?P 1.17) kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}" diff --git a/roles/kubespray-defaults/defaults/main/main.yml b/roles/kubespray-defaults/defaults/main/main.yml index 8cbfd0f01a0..094327600aa 100644 --- a/roles/kubespray-defaults/defaults/main/main.yml +++ b/roles/kubespray-defaults/defaults/main/main.yml @@ -293,6 +293,10 @@ kata_containers_enabled: false # gVisor is only supported with container_manager Docker or containerd gvisor_enabled: false +# Enable runc as additional container runtime +# When enabled, it requires container_manager=crio +runc_enabled: false + # Enable crun as additional container runtime # When enabled, it requires container_manager=crio crun_enabled: false