Upgrade Fluentbit to v2.0.9

Signed-off-by: chengdehao <[email protected]>
gregorycuellar · Feb 8, 2023 · 2e2471b · 2e2471b
1 parent 1e98ada
commit 2e2471b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
@@ -13,7 +13,7 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v2.0.8'
+  FB_IMG: 'kubesphere/fluent-bit:v2.0.9'
 
 jobs:
   build:

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
@@ -13,9 +13,9 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FD_IMG: 'kubesphere/fluentd:v1.14.6'
+  FD_IMG: 'kubesphere/fluentd:v1.15.3'
   ARCH: '-arm64'
-  FD_IMG_BASE: 'kubesphere/fluentd:v1.14.6-arm64-base'
+  FD_IMG_BASE: 'kubesphere/fluentd:v1.15.3-arm64-base'
 
 jobs:
   build-amd64:

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v2.0.8
+FB_IMG ?= kubesphere/fluent-bit:v2.0.9
 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
@@ -42,7 +42,7 @@ operator:
 fluentbit:
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.0.8"
+    tag: "v2.0.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
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.0.8
+FROM fluent/fluent-bit:2.0.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/fluentd/Dockerfile.arm64.base b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
@@ -28,7 +28,6 @@ RUN apt-get update \
  && gem install rexml -v 3.2.5 \
  && gem install async -v 1.30.3 \
  && gem install async-http -v 0.56.6 \
- && gem install ext_monitor -v 0.1.2 \
  && gem install bigdecimal -v 1.4.4 \
  && gem install resolv -v 0.2.1 \
  && gem install elasticsearch -v 7.13.3 \

diff --git 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.0.8
+  image: kubesphere/fluent-bit:v2.0.9
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/

diff --git 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.0.8
+  image: kubesphere/fluent-bit:v2.0.9
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/

diff --git 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.0.8
+  image: kubesphere/fluent-bit:v2.0.9
   fluentBitConfigName: fluent-bit-config
 
 ---

diff --git 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.0.8
+  image: kubesphere/fluent-bit:v2.0.9
   fluentBitConfigName: fluent-bit-config
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ on: @@
           - "pkg/filenotify/**"
     env:
-      FB_IMG: 'kubesphere/fluent-bit:v2.0.8'
+      FB_IMG: 'kubesphere/fluent-bit:v2.0.9'
     jobs:
       build:
@@ Expand Down @@