From 32155b5c3c24ff3698a826aadcfe8e66c2442a54 Mon Sep 17 00:00:00 2001 From: jiuxia211 <2064166368@qq.com> Date: Mon, 2 Sep 2024 22:18:23 +0800 Subject: [PATCH] update fluentbit to 3.1.6 Signed-off-by: jiuxia211 <2064166368@qq.com> --- .github/workflows/build-fb-image.yaml | 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 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml index f9f40d3b3..94147fd82 100644 --- a/.github/workflows/build-fb-image.yaml +++ b/.github/workflows/build-fb-image.yaml @@ -6,7 +6,7 @@ on: docker_tag_version: description: 'Fluent Bit image release version' required: true - default: '3.1.5' + default: '3.1.6' env: DOCKER_REPO: 'kubesphere' diff --git a/Makefile b/Makefile index 8679facd0..e9bff3e79 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:v3.1.5 -FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.1.5-debug +FB_IMG ?= kubesphere/fluent-bit:v3.1.6 +FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.1.6-debug FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 FO_IMG ?= kubesphere/fluent-operator:$(VERSION) FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index f080e1118..0a29c9532 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -83,7 +83,7 @@ fluentbit: metricRelabelings: [] image: repository: "ghcr.io/fluent/fluent-operator/fluent-bit" - tag: "3.1.5" + tag: "3.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 index 0bc21c9c1..942b077d4 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:3.1.5 +FROM fluent/fluent-bit:3.1.6 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/fluent-bit.yaml conf/parsers.conf /fluent-bit/etc/ diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug index 049d08dbd..ee2daf872 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:3.1.5-debug +FROM fluent/fluent-bit:3.1.6-debug LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/fluent-bit.yaml conf/parsers.conf /fluent-bit/etc/ diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml index ccd69a806..05a01ec72 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.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 index 632e2129b..e6bdbea54 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.6 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml index 5fd5016b5..d1003ed34 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.6 fluentBitConfigName: fluent-bit-config --- diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml index 181af757e..186099ed1 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.6 fluentBitConfigName: fluent-bit-config