From fa1dacce38c7d60a06d15fd1574c2b113ebdaf05 Mon Sep 17 00:00:00 2001 From: Ayato Tokubi Date: Thu, 5 Jun 2025 09:52:42 +0000 Subject: [PATCH 1/2] fix wrong conditions of k8s-file logging Signed-off-by: Ayato Tokubi --- src/ctr_logging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ctr_logging.c b/src/ctr_logging.c index 465bf54e..3270ff7e 100644 --- a/src/ctr_logging.c +++ b/src/ctr_logging.c @@ -159,10 +159,10 @@ void configure_log_drivers(gchar **log_drivers, int64_t log_size_max_, int64_t l k8s_total_bytes_written = k8s_bytes_written; if (!use_journald_logging) { - if (!tag) { + if (tag) { nexit("k8s-file doesn't support --log-tag"); } - if (!log_labels) { + if (log_labels) { nexit("k8s-file doesn't support --log-label"); } } From 19e20b9458e71bac7fd0ad59e6f44a1a1b6923de Mon Sep 17 00:00:00 2001 From: Ayato Tokubi Date: Thu, 5 Jun 2025 10:07:52 +0000 Subject: [PATCH 2/2] fix integration github action Signed-off-by: Ayato Tokubi --- hack/github-actions-setup | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/github-actions-setup b/hack/github-actions-setup index 66692ca3..71ce66b5 100755 --- a/hack/github-actions-setup +++ b/hack/github-actions-setup @@ -34,6 +34,7 @@ prepare_system() { sudo sysctl -w net.ipv4.conf.all.route_localnet=1 sudo sysctl -w net.ipv4.ip_forward=1 # needed for crictl test + sudo modprobe br_netfilter sudo sysctl -w net.bridge.bridge-nf-call-iptables=1 sudo iptables -t nat -I POSTROUTING -s 127.0.0.0/8 ! -d 127.0.0.0/8 -j MASQUERADE }