Merge pull request #832 from wenchajun/master

Fluent-bit upgrade to v2.1.6
fluent · Jul 13, 2023 · 1630d7b · 1630d7b
2 parents 9085a2c + 8534c47
commit 1630d7b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git 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.4'
-  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.4-debug'
+  FB_IMG: 'kubesphere/fluent-bit:v2.1.6'
+  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.6-debug'
 
 jobs:
   build:

diff --git 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.4
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.4-debug
+FB_IMG ?= kubesphere/fluent-bit:v2.1.6
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.6-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
@@ -71,7 +71,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.1.4"
+    tag: "v2.1.6"
   # 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 -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.4
+FROM fluent/fluent-bit:2.1.6
 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
@@ -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.4-debug
+FROM fluent/fluent-bit:2.1.6-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
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   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.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   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.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   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.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   fluentBitConfigName: fluent-bit-config