From cede6e53102a1cc1050dabad302a94dd3c53176c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Reegn?= Date: Tue, 24 Sep 2024 13:21:24 +0200 Subject: [PATCH] Update fluent-bit to 3.1.8 --- .github/workflows/build-fb-image.yaml | 2 +- Makefile | 4 ++-- README.md | 2 +- charts/fluent-operator/values.yaml | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile.debug | 2 +- config/samples/fluentbit_v1alpha2_fluentbit.yaml | 2 +- .../forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml | 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 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml index adf0e5040..bb3f40463 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.7' + default: '3.1.8' env: DOCKER_REPO: 'kubesphere' diff --git a/Makefile b/Makefile index f7822168d..148e80925 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.7 -FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.1.7-debug +FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v3.1.8 +FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v3.1.8-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/README.md b/README.md index 5b0dbe3d6..69ecc3bc0 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Fluent Bit will be deployed as a DaemonSet while Fluentd will be deployed as a S The following CRDs are defined for Fluent Bit: -- **`FluentBit`**: Defines the Fluent Bit DaemonSet and its configs. A custom Fluent Bit image `kubesphere/fluent-bit` is required to work with FluentBit Operator for dynamic configuration reloading. +- **`FluentBit`**: Defines the Fluent Bit DaemonSet and its configs. A custom Fluent Bit image `ghcr.io/fluent/fluent-operator/fluent-bit` is required to work with FluentBit Operator for dynamic configuration reloading. - **`ClusterFluentBitConfig`**: Select cluster-level input/filter/output plugins and generates the final config into a Secret. - **`FluentBitConfig`**: Selects namespace-level filter/output/parser and cluster-level parser plugins and generates final config into a Secret. - **`ClusterInput`**: Defines cluster-level input config sections. diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 05174b00e..3c025eb3b 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -86,7 +86,7 @@ fluentbit: metricRelabelings: [] image: repository: "ghcr.io/fluent/fluent-operator/fluent-bit" - tag: "3.1.7" + tag: "3.1.8" # 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 4955e7761..65cc56bb2 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.7 +FROM fluent/fluent-bit:3.1.8 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 5b39b012f..497eedf99 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.7-debug +FROM fluent/fluent-bit:3.1.8-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/config/samples/fluentbit_v1alpha2_fluentbit.yaml b/config/samples/fluentbit_v1alpha2_fluentbit.yaml index 9aa204b6d..ca20e7519 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.0.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 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 f01abc00c..b8e3a052b 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: ghcr.io/fluent/fluent-operator/fluent-bit:3.0.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml index 89d1d0966..d0c324454 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.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml index e586bf3a3..4cb594880 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.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml index 57b9423de..990f2b4be 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.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 fluentBitConfigName: fluent-bit-config --- diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml index 9db3168f4..7a7c4cfe4 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.7 + image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.8 fluentBitConfigName: fluent-bit-config