From 8433632bbe6e63bc8d46441277fde3603ad40692 Mon Sep 17 00:00:00 2001 From: ehila Date: Tue, 2 Jun 2026 13:21:20 -0400 Subject: [PATCH] fix: update arbiter crio config update arbtier crio config to keep inline with master and use crun as runc is no longer available in rhel10 Signed-off-by: ehila --- .../01-arbiter-container-runtime/_base/files/crio.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml b/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml index 7b3b522044..315172252d 100644 --- a/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml +++ b/templates/arbiter/01-arbiter-container-runtime/_base/files/crio.yaml @@ -17,7 +17,7 @@ contents: default_env = [ "NSS_SDB_USE_CACHE=no", ] - default_runtime = "runc" + default_runtime = "crun" log_level = "info" cgroup_manager = "systemd" default_sysctls = [ @@ -51,6 +51,7 @@ contents: ] # Based on https://github.com/containers/crun/blob/27d7dd3a0/README.md?plain=1#L48 container_min_memory = "512KiB" + default_annotations = {"run.oci.systemd.subgroup" = ""} [crio.runtime.workloads.openshift-builder] activation_annotation = "io.openshift.builder" @@ -65,6 +66,7 @@ contents: pause_image = "{{.Images.infraImageKey}}" pause_image_auth_file = "/var/lib/kubelet/config.json" pause_command = "/usr/bin/pod" + short_name_mode = "disabled" [crio.network] network_dir = "/etc/kubernetes/cni/net.d/"