From d7756d85ef59355aefcbea1306557dd5eab45aa6 Mon Sep 17 00:00:00 2001
From: QCU <qcu266@gmail.com>
Date: Thu, 16 May 2024 15:41:26 +0800
Subject: [PATCH] fix: Change the position of the containerd_extra_args
parameter to make the parameter more universal. (#11013)
that you can only place thing in the root table in a toml document before the first table heading.
---
roles/container-engine/containerd/templates/config.toml.j2 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
index 088a680ab..8a1ee8aa5 100644
--- a/roles/container-engine/containerd/templates/config.toml.j2
+++ b/roles/container-engine/containerd/templates/config.toml.j2
@@ -3,6 +3,10 @@ root = "{{ containerd_storage_dir }}"
state = "{{ containerd_state_dir }}"
oom_score = {{ containerd_oom_score }}
+{% if containerd_extra_args is defined %}
+{{ containerd_extra_args }}
+{% endif %}
+
[grpc]
max_recv_message_size = {{ containerd_grpc_max_recv_message_size }}
max_send_message_size = {{ containerd_grpc_max_send_message_size }}
@@ -104,6 +108,3 @@ oom_score = {{ containerd_oom_score }}
service_name = "{{ containerd_tracing_service_name }}"
{% endif %}
-{% if containerd_extra_args is defined %}
-{{ containerd_extra_args }}
-{% endif %}
--
GitLab