diff --git a/inventory/sample/group_vars/all/containerd.yml b/inventory/sample/group_vars/all/containerd.yml index 1888b24180d..afe330775c4 100644 --- a/inventory/sample/group_vars/all/containerd.yml +++ b/inventory/sample/group_vars/all/containerd.yml @@ -24,7 +24,11 @@ # containerd_grpc_max_recv_message_size: 16777216 # containerd_grpc_max_send_message_size: 16777216 +# containerd_debug_address: "/var/run/containerd/debug.sock" # containerd_debug_level: "info" +# containerd_debug_format: "text" +# containerd_debug_uid: 0 +# containerd_debug_gid: 0 # containerd_metrics_address: "" diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 9ecace92f00..2aac447c937 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -46,7 +46,13 @@ containerd_base_runtime_specs: containerd_grpc_max_recv_message_size: 16777216 containerd_grpc_max_send_message_size: 16777216 -containerd_debug_level: "info" +# debug socket location: unix or tcp format +containerd_debug_address: "" +containerd_debug_level: "" +# logs format, supported values: text, json +containerd_debug_format: "" +containerd_debug_uid: 0 +containerd_debug_gid: 0 containerd_metrics_address: "" diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index 30773aacc90..3f36c47efd6 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -8,7 +8,19 @@ oom_score = {{ containerd_oom_score }} max_send_message_size = {{ containerd_grpc_max_send_message_size }} [debug] +{% if containerd_debug_address %} + address = "{{ containerd_debug_address }}" +{% endif %} level = "{{ containerd_debug_level }}" +{% if containerd_debug_format %} + format = "{{ containerd_debug_format }}" +{% endif %} +{% if containerd_debug_uid %} + uid = "{{ containerd_debug_uid }}" +{% endif %} +{% if containerd_debug_gid %} + gid = "{{ containerd_debug_gid }}" +{% endif %} [metrics] address = "{{ containerd_metrics_address }}"