From 36d9056e8feab7a244d647380e5739b5106d4625 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Nov 2024 11:38:32 +0100 Subject: [PATCH] board/common: Use finit's log: to capture output from containers Since `conmon` only logs the output from the monitored container's `stdout`/`stderr`, we might as well get rid of `k8s-logger`, and let the output pass through to finit, which will then pipe the messages to syslog. Fix #836 --- board/common/rootfs/etc/finit.d/available/container@.conf | 4 +--- board/common/rootfs/usr/sbin/container | 2 +- configs/aarch64_defconfig | 1 - configs/r2s_defconfig | 1 - configs/riscv64_defconfig | 1 - configs/x86_64_defconfig | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/board/common/rootfs/etc/finit.d/available/container@.conf b/board/common/rootfs/etc/finit.d/available/container@.conf index 765defa9..19facfb0 100644 --- a/board/common/rootfs/etc/finit.d/available/container@.conf +++ b/board/common/rootfs/etc/finit.d/available/container@.conf @@ -1,6 +1,4 @@ task name:container-%i :setup \ [2345] container -n %i setup -- Setup container %i -service :%i pid:!/run/k8s-logger-%i.pid \ - [2345] k8s-logger -cni %i -f local1 /run/containers/%i.fifo -- Logger for container %i -sysv :%i pid:!/run/container:%i.pid kill:10 \ +sysv :%i pid:!/run/container:%i.pid log:prio:local1,tag:%i kill:10 \ [2345] container -n %i -- container %i diff --git a/board/common/rootfs/usr/sbin/container b/board/common/rootfs/usr/sbin/container index 88ac93c4..dc698c7e 100755 --- a/board/common/rootfs/usr/sbin/container +++ b/board/common/rootfs/usr/sbin/container @@ -226,7 +226,7 @@ create() fi if [ -z "$logging" ]; then - logging="--log-driver k8s-file --log-opt path=/run/containers/$name.fifo" + logging="--log-driver none" fi # When we get here we've already fetched, or pulled, the image diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 1264d624..1b505875 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -146,7 +146,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y BR2_PACKAGE_IITO=y -BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LANDING=y diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig index 12932dfb..c4c933be 100644 --- a/configs/r2s_defconfig +++ b/configs/r2s_defconfig @@ -187,7 +187,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y BR2_PACKAGE_IITO=y -BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LANDING=y diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig index ba1396de..edab54d7 100644 --- a/configs/riscv64_defconfig +++ b/configs/riscv64_defconfig @@ -177,7 +177,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y BR2_PACKAGE_IITO=y -BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LANDING=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index e69e3d31..5ec8fde0 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -150,7 +150,6 @@ BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y BR2_PACKAGE_IITO=y -BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y BR2_PACKAGE_LANDING=y