From 3f2904e93370425b379b5a0e0a93ba0d3913e5f1 Mon Sep 17 00:00:00 2001 From: Elon Cheng Date: Wed, 13 Sep 2023 14:55:35 +0800 Subject: [PATCH] Bump fluentbit to 2.1.9 (#921) * Bump fluentbit to 2.1.9 Signed-off-by: dehaocheng * modify changelog Signed-off-by: dehaocheng --------- Signed-off-by: dehaocheng --- .github/workflows/build-fb-image.yaml | 4 ++-- CHANGELOG.md | 2 +- Makefile | 4 ++-- charts/fluent-operator/values.yaml | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile.debug | 2 +- manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +- manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +- manifests/quick-start/fluentbit.yaml | 2 +- manifests/regex-parser/fluentbit-fluentBit.yaml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml index 44dedd17d..1f3b2a498 100644 --- a/.github/workflows/build-fb-image.yaml +++ b/.github/workflows/build-fb-image.yaml @@ -13,8 +13,8 @@ on: - "pkg/filenotify/**" env: - FB_IMG: 'kubesphere/fluent-bit:v2.1.8' - FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.8-debug' + FB_IMG: 'kubesphere/fluent-bit:v2.1.9' + FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.9-debug' jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 767c53ff0..243c4542e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,13 +16,13 @@ - Remove Duplicate Cluster parsers in Fluent-bit config. (#853) - Add option to configure hostNetwork daemonset propertie (#863) - Helm chart generation of ClusterOutput for loki (#865) (#906) -- Bump fluentbit to 2.1.8. (#867) - Add SuppressTypeName option to helm, as newer ES needs it for bulk operation (#869) - Adjusting the parameters of fluentbit (#880) @wenchajun - Add an extras section to the chart allowing new and less used features of the CRD to be used from the chart (#889) - Add ImagePullSecret for fluentd (#891) - Add compress in fluentbit output es (#899) - Expose ports on collector statefulset (#917) +- Bump fluentbit to 2.1.9 (#921) - build(deps): Bump github.com/onsi/gomega from 1.27.8 to 1.27.10 (#844) - build(deps): Bump k8s.io/apimachinery from 0.27.3 to 0.27.4 (#847) - build(deps): Bump helm/kind-action from 1.7.0 to 1.8.0 (#859) diff --git a/Makefile b/Makefile index fb7f2ff02..d52af6aac 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION?=$(shell cat VERSION | tr -d " \t\n\r") # Image URL to use all building/pushing image targets -FB_IMG ?= kubesphere/fluent-bit:v2.1.8 -FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.8-debug +FB_IMG ?= kubesphere/fluent-bit:v2.1.9 +FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.9-debug FD_IMG ?= kubesphere/fluentd:v1.15.3 FO_IMG ?= kubesphere/fluent-operator:$(VERSION) FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 1725d9b37..25d66e16f 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -71,7 +71,7 @@ fluentbit: enable: true image: repository: "kubesphere/fluent-bit" - tag: "v2.1.8" + tag: "v2.1.9" # fluentbit resources. If you do want to specify resources, adjust them as necessary # You can adjust it based on the log volume. resources: diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile index 3919e8d73..0b53e6fb5 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile +++ b/cmd/fluent-watcher/fluentbit/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:2.1.8 +FROM fluent/fluent-bit:2.1.9 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/ diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug index 356bc155b..b543388c3 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug +++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug @@ -6,7 +6,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:2.1.8-debug +FROM fluent/fluent-bit:2.1.9-debug LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/ diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml index 86147a2fd..cee7a8135 100644 --- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml +++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v2.1.8 + image: kubesphere/fluent-bit:v2.1.9 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml index dc6eacffd..7d69a3236 100644 --- a/manifests/logging-stack/fluentbit-fluentBit.yaml +++ b/manifests/logging-stack/fluentbit-fluentBit.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v2.1.8 + image: kubesphere/fluent-bit:v2.1.9 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml index 83b8873ee..b2af435e7 100644 --- a/manifests/quick-start/fluentbit.yaml +++ b/manifests/quick-start/fluentbit.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v2.1.8 + image: kubesphere/fluent-bit:v2.1.9 fluentBitConfigName: fluent-bit-config --- diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml index 54340005c..f51d245ee 100644 --- a/manifests/regex-parser/fluentbit-fluentBit.yaml +++ b/manifests/regex-parser/fluentbit-fluentBit.yaml @@ -6,5 +6,5 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v2.1.8 + image: kubesphere/fluent-bit:v2.1.9 fluentBitConfigName: fluent-bit-config