Skip to content

Commit 0279e63

Browse files
committed
deps: upgrade fluentbit to latest
Signed-off-by: Peter Wilcsinszky <[email protected]>
1 parent f63858a commit 0279e63

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

e2e/charts/logging-operator-logging/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ annotations:
1818
description: Moved to to location
1919
artifacthub.io/images: |
2020
- name: fluent-bit
21-
image: fluent/fluent-bit:1.9.5
21+
image: fluent/fluent-bit:2.1.4
2222
- name: fluentd
2323
image: ghcr.io/kube-logging/fluentd:v1.15-ruby3
2424
- name: syslog-ng

pkg/resources/nodeagent/nodeagent.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ import (
2323
"github.com/cisco-open/operator-tools/pkg/typeoverride"
2424
util "github.com/cisco-open/operator-tools/pkg/utils"
2525
"github.com/go-logr/logr"
26-
"github.com/kube-logging/logging-operator/pkg/resources"
27-
"github.com/kube-logging/logging-operator/pkg/resources/loggingdataprovider"
28-
"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
2926
appsv1 "k8s.io/api/apps/v1"
3027
corev1 "k8s.io/api/core/v1"
3128
v1 "k8s.io/api/core/v1"
@@ -35,6 +32,10 @@ import (
3532
"sigs.k8s.io/controller-runtime/pkg/builder"
3633
"sigs.k8s.io/controller-runtime/pkg/client"
3734
"sigs.k8s.io/controller-runtime/pkg/reconcile"
35+
36+
"github.com/kube-logging/logging-operator/pkg/resources"
37+
"github.com/kube-logging/logging-operator/pkg/resources/loggingdataprovider"
38+
"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
3839
)
3940

4041
const (
@@ -61,7 +62,7 @@ func NodeAgentFluentbitDefaults(userDefined v1beta1.NodeAgentConfig) (*v1beta1.N
6162
Containers: []v1.Container{
6263
{
6364
Name: containerName,
64-
Image: "fluent/fluent-bit:1.9.10",
65+
Image: v1beta1.DefaultFluentbitImageRepository + ":" + v1beta1.DefaultFluentbitImageTag,
6566
Command: []string{"/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/conf_operator/fluent-bit.conf"},
6667
ImagePullPolicy: v1.PullIfNotPresent,
6768
Resources: v1.ResourceRequirements{

pkg/sdk/extensions/extensionsconfig/config.go

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

7373
// HostTailer configuration
7474
var HostTailer = HostTailerConfig{
75-
FluentBitImage: "fluent/fluent-bit:1.9.10",
75+
FluentBitImage: "fluent/fluent-bit:2.1.4",
7676
TailerAffix: "host-tailer",
7777
}
7878

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

8686
// TailerWebhook configuration
8787
var TailerWebhook = TailerWebhookConfig{
88-
FluentBitImage: "fluent/fluent-bit:1.9.10",
88+
FluentBitImage: "fluent/fluent-bit:2.1.4",
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
@@ -126,7 +126,7 @@ type DefaultFlowSpec struct {
126126

127127
const (
128128
DefaultFluentbitImageRepository = "fluent/fluent-bit"
129-
DefaultFluentbitImageTag = "1.9.10"
129+
DefaultFluentbitImageTag = "2.1.4"
130130
DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/kube-logging/node-exporter"
131131
DefaultFluentbitBufferVolumeImageTag = "v0.6.1"
132132
DefaultFluentbitBufferStorageVolumeName = "fluentbit-buffer"

0 commit comments

Comments
 (0)