diff --git a/images/fluentd/Dockerfile b/images/fluentd/Dockerfile index d6d93024e..ddcb245cd 100644 --- a/images/fluentd/Dockerfile +++ b/images/fluentd/Dockerfile @@ -22,8 +22,10 @@ RUN addgroup -S -g 101 fluent && adduser -S -G fluent -u 100 fluent \ tini libmaxminddb geoip \ snappy libssl3 libcrypto3 \ && apk add --no-cache $BUILD_DEPS \ + # Remove fortify headers to fix PATH_MAX compilation errors in native gems + && rm -rf /usr/include/fortify \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem install fluentd -v 1.18.0 \ + && gem install fluentd -v 1.19.0 \ && fluent-gem install specific_install -v 0.3.8 \ && fluent-gem install fluent-plugin-label-router -v 0.5.0 \ && fluent-gem install snappy -v 0.0.15 \ @@ -72,6 +74,7 @@ ADD ./outputs/Gemfile.lock /Gemfile.outputs.lock USER root RUN apk add --no-cache $BUILD_DEPS \ + # Remove fortify headers to fix PATH_MAX compilation errors in native gems && rm -rf /usr/include/fortify \ && touch /etc/gemrc \ && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-syslog_rfc5424.git --ref 4ab9f7df3757b0e31e4bc209acab05a518efdce3 \ diff --git a/pkg/sdk/extensions/extensionsconfig/config.go b/pkg/sdk/extensions/extensionsconfig/config.go index 22bf84c89..2406e59c8 100644 --- a/pkg/sdk/extensions/extensionsconfig/config.go +++ b/pkg/sdk/extensions/extensionsconfig/config.go @@ -71,7 +71,7 @@ var Global = GlobalConfig{ // HostTailer configuration var HostTailer = HostTailerConfig{ - FluentBitImage: "ghcr.io/fluent/fluent-bit:4.0.3", + FluentBitImage: "ghcr.io/fluent/fluent-bit:4.1.0", TailerAffix: "host-tailer", } @@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{ // TailerWebhook configuration var TailerWebhook = TailerWebhookConfig{ - FluentBitImage: "ghcr.io/fluent/fluent-bit:4.0.3", + FluentBitImage: "ghcr.io/fluent/fluent-bit:4.1.0", AnnotationKey: "sidecar.logging-extensions.banzaicloud.io/tail", ServerPath: "/tailer-webhook", ServerPort: 9443, diff --git a/pkg/sdk/logging/api/v1beta1/logging_types.go b/pkg/sdk/logging/api/v1beta1/logging_types.go index 614b71c05..53695c696 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -199,7 +199,7 @@ var Version string const ( DefaultFluentbitImageRepository = "ghcr.io/fluent/fluent-bit" - DefaultFluentbitImageTag = "4.0.3" + DefaultFluentbitImageTag = "4.1.0" DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/kube-logging/logging-operator/node-exporter" DefaultFluentbitBufferVolumeImageTag = "latest" DefaultFluentbitBufferStorageVolumeName = "fluentbit-buffer"