Skip to content

Commit e7b819c

Browse files
authored
Merge pull request #2120 from kube-logging/feat/bump-fluent
feat: bump fluentd to 1.19.0; fluentbhit to 4.1.0
2 parents be9be30 + 7ed3bab commit e7b819c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

images/fluentd/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ RUN addgroup -S -g 101 fluent && adduser -S -G fluent -u 100 fluent \
2222
tini libmaxminddb geoip \
2323
snappy libssl3 libcrypto3 \
2424
&& apk add --no-cache $BUILD_DEPS \
25+
# Remove fortify headers to fix PATH_MAX compilation errors in native gems
26+
&& rm -rf /usr/include/fortify \
2527
&& echo 'gem: --no-document' >> /etc/gemrc \
26-
&& gem install fluentd -v 1.18.0 \
28+
&& gem install fluentd -v 1.19.0 \
2729
&& fluent-gem install specific_install -v 0.3.8 \
2830
&& fluent-gem install fluent-plugin-label-router -v 0.5.0 \
2931
&& fluent-gem install snappy -v 0.0.15 \
@@ -72,6 +74,7 @@ ADD ./outputs/Gemfile.lock /Gemfile.outputs.lock
7274
USER root
7375

7476
RUN apk add --no-cache $BUILD_DEPS \
77+
# Remove fortify headers to fix PATH_MAX compilation errors in native gems
7578
&& rm -rf /usr/include/fortify \
7679
&& touch /etc/gemrc \
7780
&& fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-syslog_rfc5424.git --ref 4ab9f7df3757b0e31e4bc209acab05a518efdce3 \

pkg/sdk/extensions/extensionsconfig/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var Global = GlobalConfig{
7171

7272
// HostTailer configuration
7373
var HostTailer = HostTailerConfig{
74-
FluentBitImage: "ghcr.io/fluent/fluent-bit:4.0.3",
74+
FluentBitImage: "ghcr.io/fluent/fluent-bit:4.1.0",
7575
TailerAffix: "host-tailer",
7676
}
7777

@@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{
8585

8686
// TailerWebhook configuration
8787
var TailerWebhook = TailerWebhookConfig{
88-
FluentBitImage: "ghcr.io/fluent/fluent-bit:4.0.3",
88+
FluentBitImage: "ghcr.io/fluent/fluent-bit:4.1.0",
8989
AnnotationKey: "sidecar.logging-extensions.banzaicloud.io/tail",
9090
ServerPath: "/tailer-webhook",
9191
ServerPort: 9443,

pkg/sdk/logging/api/v1beta1/logging_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ var Version string
199199

200200
const (
201201
DefaultFluentbitImageRepository = "ghcr.io/fluent/fluent-bit"
202-
DefaultFluentbitImageTag = "4.0.3"
202+
DefaultFluentbitImageTag = "4.1.0"
203203
DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/kube-logging/logging-operator/node-exporter"
204204
DefaultFluentbitBufferVolumeImageTag = "latest"
205205
DefaultFluentbitBufferStorageVolumeName = "fluentbit-buffer"

0 commit comments

Comments
 (0)