Skip to content

fix wrong conditions of k8s-file logging #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haircommander merged 2 commits into from
Jun 5, 2025
+3 −2
Merged

fix wrong conditions of k8s-file logging #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa1dacc
fix wrong conditions of k8s-file logging
bitoku Jun 5, 2025
19e20b9
fix integration github action
bitoku Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hack/github-actions-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions src/ctr_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
Loading