deps: upgrade fluentbit to latest

Signed-off-by: Peter Wilcsinszky <peter.wilcsinszky@axoflow.com>
kube-logging · Jun 2, 2023 · 0279e63 · 0279e63
1 parent f63858a
commit 0279e63
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/e2e/charts/logging-operator-logging/Chart.yaml b/e2e/charts/logging-operator-logging/Chart.yaml
@@ -18,7 +18,7 @@ annotations:
       description: Moved to to location
   artifacthub.io/images: |
     - name: fluent-bit
-      image: fluent/fluent-bit:1.9.5
+      image: fluent/fluent-bit:2.1.4
     - name: fluentd
       image: ghcr.io/kube-logging/fluentd:v1.15-ruby3
     - name: syslog-ng

diff --git a/pkg/resources/nodeagent/nodeagent.go b/pkg/resources/nodeagent/nodeagent.go
@@ -23,9 +23,6 @@ import (
 	"github.com/cisco-open/operator-tools/pkg/typeoverride"
 	util "github.com/cisco-open/operator-tools/pkg/utils"
 	"github.com/go-logr/logr"
-	"github.com/kube-logging/logging-operator/pkg/resources"
-	"github.com/kube-logging/logging-operator/pkg/resources/loggingdataprovider"
-	"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -35,6 +32,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/kube-logging/logging-operator/pkg/resources"
+	"github.com/kube-logging/logging-operator/pkg/resources/loggingdataprovider"
+	"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
 )
 
 const (
@@ -61,7 +62,7 @@ func NodeAgentFluentbitDefaults(userDefined v1beta1.NodeAgentConfig) (*v1beta1.N
 							Containers: []v1.Container{
 								{
 									Name:            containerName,
-									Image:           "fluent/fluent-bit:1.9.10",
+									Image:           v1beta1.DefaultFluentbitImageRepository + ":" + v1beta1.DefaultFluentbitImageTag,
 									Command:         []string{"/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/conf_operator/fluent-bit.conf"},
 									ImagePullPolicy: v1.PullIfNotPresent,
 									Resources: v1.ResourceRequirements{

diff --git a/pkg/sdk/extensions/extensionsconfig/config.go b/pkg/sdk/extensions/extensionsconfig/config.go
@@ -72,7 +72,7 @@ var Global = GlobalConfig{
 
 // HostTailer configuration
 var HostTailer = HostTailerConfig{
-	FluentBitImage: "fluent/fluent-bit:1.9.10",
+	FluentBitImage: "fluent/fluent-bit:2.1.4",
 	TailerAffix:    "host-tailer",
 }
 
@@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{
 
 // TailerWebhook configuration
 var TailerWebhook = TailerWebhookConfig{
-	FluentBitImage:    "fluent/fluent-bit:1.9.10",
+	FluentBitImage:    "fluent/fluent-bit:2.1.4",
 	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
@@ -126,7 +126,7 @@ type DefaultFlowSpec struct {
 
 const (
 	DefaultFluentbitImageRepository             = "fluent/fluent-bit"
-	DefaultFluentbitImageTag                    = "1.9.10"
+	DefaultFluentbitImageTag                    = "2.1.4"
 	DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/kube-logging/node-exporter"
 	DefaultFluentbitBufferVolumeImageTag        = "v0.6.1"
 	DefaultFluentbitBufferStorageVolumeName     = "fluentbit-buffer"