From d59a5bf4316a55f2c882314cdcf3f29e284f958d Mon Sep 17 00:00:00 2001
From: kyrie <139965836+KubeKyrie@users.noreply.github.com>
Date: Mon, 30 Sep 2024 16:12:03 +0800
Subject: [PATCH] update containerd_max_container_log_line_size default value
(#11585)
Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io>
---
docs/developers/ci-setup.md | 2 +-
inventory/sample/group_vars/all/containerd.yml | 2 +-
roles/container-engine/containerd/defaults/main.yml | 2 +-
tests/common/_docker_hub_registry_mirror.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/developers/ci-setup.md b/docs/developers/ci-setup.md
index ae52415c7..e397c579b 100644
--- a/docs/developers/ci-setup.md
+++ b/docs/developers/ci-setup.md
@@ -90,7 +90,7 @@ containerd_registries_mirrors:
capabilities: ["pull", "resolve"]
skip_verify: false
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
crio_registries_mirrors:
- prefix: docker.io
diff --git a/inventory/sample/group_vars/all/containerd.yml b/inventory/sample/group_vars/all/containerd.yml
index c8fa41943..906437df0 100644
--- a/inventory/sample/group_vars/all/containerd.yml
+++ b/inventory/sample/group_vars/all/containerd.yml
@@ -51,7 +51,7 @@
# capabilities: ["pull", "resolve"]
# skip_verify: false
-# containerd_max_container_log_line_size: -1
+# containerd_max_container_log_line_size: 16384
# containerd_registry_auth:
# - registry: 10.0.0.2:5000
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index f04bb927a..b6c7fdccd 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -63,7 +63,7 @@ containerd_registries_mirrors:
capabilities: ["pull", "resolve"]
skip_verify: false
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
# If enabled it will allow non root users to use port numbers <1024
containerd_enable_unprivileged_ports: false
diff --git a/tests/common/_docker_hub_registry_mirror.yml b/tests/common/_docker_hub_registry_mirror.yml
index 4280f9d8e..8875d2173 100644
--- a/tests/common/_docker_hub_registry_mirror.yml
+++ b/tests/common/_docker_hub_registry_mirror.yml
@@ -15,7 +15,7 @@ containerd_registries_mirrors:
capabilities: ["pull", "resolve"]
skip_verify: false
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
crio_registries:
- prefix: docker.io
--
GitLab