From 8cd55e6a338522b15a215bf4d837bb996f320621 Mon Sep 17 00:00:00 2001 From: Zadkiel Aharonian Date: Wed, 4 May 2022 12:40:46 +0200 Subject: [PATCH] Fluentbit 1.8.15 -> 1.9.2 --- charts/logging-operator-logging/README.md | 2 +- charts/logging-operator-logging/values.yaml | 2 +- charts/logging-operator/README.md | 2 +- config/samples/logging_v1alpha2_logging_debug.yaml | 2 +- pkg/resources/nodeagent/nodeagent.go | 2 +- pkg/sdk/extensions/extensionsconfig/config.go | 4 ++-- pkg/sdk/logging/api/v1beta1/logging_types.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/logging-operator-logging/README.md b/charts/logging-operator-logging/README.md index 2a885f7af..6b672fe7a 100644 --- a/charts/logging-operator-logging/README.md +++ b/charts/logging-operator-logging/README.md @@ -22,7 +22,7 @@ The following tables lists the configurable parameters of the logging-operator-l | `fluentbit.enabled` | Install fluent-bit | true | | `fluentbit.namespace` | Specified fluentbit installation namespace | same as operator namespace | | `fluentbit.tolerations` | Tolerations for fluentbit daemonset | none | -| `fluentbit.image.tag` | Fluentbit container image tag | `1.8.15` | +| `fluentbit.image.tag` | Fluentbit container image tag | `1.9.2` | | `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` | | `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` | | `fluentbit.podPriorityClassName` | Priority class name for fluentbit pods | none | diff --git a/charts/logging-operator-logging/values.yaml b/charts/logging-operator-logging/values.yaml index ae5236637..f648e3496 100644 --- a/charts/logging-operator-logging/values.yaml +++ b/charts/logging-operator-logging/values.yaml @@ -29,7 +29,7 @@ nodeAgents: {} # template: # spec: # containers: -# - image: banzaicloud/fluentbit:1.8.15 +# - image: banzaicloud/fluentbit:1.9.2 # name: fluent-bit # tls: # enabled: false diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index b4e152ff3..0bd51691d 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -113,7 +113,7 @@ The following tables lists the configurable parameters of the logging-operator-l | `tls.sharedKey` | Shared key between nodes (fluentd-fluentbit) | [autogenerated] | | `fluentbit.enabled` | Install fluent-bit | true | | `fluentbit.namespace` | Specified fluentbit installation namespace | same as operator namespace | -| `fluentbit.image.tag` | Fluentbit container image tag | `1.8.15` | +| `fluentbit.image.tag` | Fluentbit container image tag | `1.9.2` | | `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` | | `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` | | `fluentd.enabled` | Install fluentd | true | diff --git a/config/samples/logging_v1alpha2_logging_debug.yaml b/config/samples/logging_v1alpha2_logging_debug.yaml index 91a95c418..a15293749 100644 --- a/config/samples/logging_v1alpha2_logging_debug.yaml +++ b/config/samples/logging_v1alpha2_logging_debug.yaml @@ -8,7 +8,7 @@ spec: disablePvc: true fluentbit: image: - tag: 1.8.15-debug + tag: 1.9.2-debug repository: fluent/fluent-bit pullPolicy: IfNotPresent controlNamespace: default diff --git a/pkg/resources/nodeagent/nodeagent.go b/pkg/resources/nodeagent/nodeagent.go index d660b4940..19ba7695f 100644 --- a/pkg/resources/nodeagent/nodeagent.go +++ b/pkg/resources/nodeagent/nodeagent.go @@ -61,7 +61,7 @@ func NodeAgentFluentbitDefaults(userDefined **v1beta1.NodeAgent) (*v1beta1.NodeA Containers: []v1.Container{ { Name: containerName, - Image: "fluent/fluent-bit:1.8.15", + Image: "fluent/fluent-bit:1.9.2", 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 index 05516599d..1af4527a6 100644 --- 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.8.15", + FluentBitImage: "fluent/fluent-bit:1.9.2", TailerAffix: "host-tailer", } @@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{ // TailerWebhook configuration var TailerWebhook = TailerWebhookConfig{ - FluentBitImage: "fluent/fluent-bit:1.8.15", + FluentBitImage: "fluent/fluent-bit:1.9.2", 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 d2007ef99..3f2500b19 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -114,7 +114,7 @@ type DefaultFlowSpec struct { const ( DefaultFluentbitImageRepository = "fluent/fluent-bit" - DefaultFluentbitImageTag = "1.8.15" + DefaultFluentbitImageTag = "1.9.2" DefaultFluentdImageRepository = "ghcr.io/banzaicloud/fluentd" DefaultFluentdImageTag = "v1.14.6-alpine-4" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer"