diff --git a/Makefile b/Makefile index 4d68f7da2..3a01e1860 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.2.2 -FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.2.2-debug +FB_IMG ?= kubesphere/fluent-bit:v3.0.4 +FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.0.4-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 83f77fa63..904c61a0e 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -75,7 +75,7 @@ fluentbit: serviceMonitor: false image: repository: "kubesphere/fluent-bit" - tag: "v2.2.2" + tag: "v3.0.4" # 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 ec021001c..21ecd87d3 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.2.2 +FROM fluent/fluent-bit:3.0.4 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 59b87e6b3..f0609a446 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.2.2-debug +FROM fluent/fluent-bit:3.0.4-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/config/samples/fluentbit_v1alpha2_fluentbit.yaml b/config/samples/fluentbit_v1alpha2_fluentbit.yaml index 49cf41746..b8b85b3da 100644 --- a/config/samples/fluentbit_v1alpha2_fluentbit.yaml +++ b/config/samples/fluentbit_v1alpha2_fluentbit.yaml @@ -5,7 +5,7 @@ metadata: labels: app: fluent-bit spec: - image: kubesphere/fluent-bit:v1.8.3 + image: kubesphere/fluent-bit:v3.0.4 imagePullPolicy: IfNotPresent positionDB: hostPath: diff --git a/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml b/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml index cfab8cde9..c7b2171d9 100644 --- a/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml +++ b/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v1.8.3 + image: kubesphere/fluent-bit:v3.0.4 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml index 519594254..213507f26 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.2.2 + image: kubesphere/fluent-bit:v3.0.4 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml index d08e7013a..4986a2530 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.2.2 + image: kubesphere/fluent-bit:v3.0.4 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml index ff70801bf..d500e7f68 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.2.2 + image: kubesphere/fluent-bit:v3.0.4 fluentBitConfigName: fluent-bit-config --- @@ -44,4 +44,4 @@ metadata: fluentbit.fluent.io/enabled: "true" spec: match: "*" - stdout: {} \ No newline at end of file + stdout: {} diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml index f37b79609..855733a52 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.2.2 + image: kubesphere/fluent-bit:v3.0.4 fluentBitConfigName: fluent-bit-config