Merge pull request #1300 from Gentleelephant/upfate-fluentbit-3.1.5

update fluentbit to 3.1.5

Author: benjaminhuo

.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.4'
+        default: '3.1.5'
 
 env:
   DOCKER_REPO: 'kubesphere'

CHANGELOG.md

@@ -1,3 +1,48 @@
+## 3.1.0 / 2024-08-14
+### Features
+- Render ConfigMap only if key is not empty string (#1299) @dex4er
+- Set explicit fluent-bit name label selector (#1293) @rmvangun
+- Allow fluent-operator to watch Kubernetes events (#1277) @thomasgouveia
+- add fluent bit config-reload via HTTP (#1286) @jiuxia211
+- feat(fluentbit): add fluentbit input_udp plugin (#1267) @cw-Guo
+- add tag and tag_from_uri for opentelemetry input plugin (#1255) @smallc2009
+- add compression to opensearch output plugin (#1258) @smallc2009
+- Support for patch release tags. (#1246) @joshuabaird
+- Add missing fluent-bit config parameters (#1244) @reegnz
+
+### ENHANCEMENT
+- build(deps): Bump github.com/onsi/gomega from 1.33.1 to 1.34.1 (#1275) @dependabot
+- build(deps): Bump github.com/go-logr/logr from 1.4.1 to 1.4.2 (#1271) @dependabot
+- build(deps): Bump k8s.io/klog/v2 from 2.120.1 to 2.130.1 (#1272) @dependabot
+- build(deps): Bump aquasecurity/trivy-action from 0.23.0 to 0.24.0 (#1279) @dependabot
+- build(deps): Bump golang.org/x/sync from 0.7.0 to 0.8.0 (#1283) @dependabot
+- build(deps): Bump golang from 1.22.5-alpine3.19 to 1.22.6-alpine3.19 in /cmd/fluent-manager (#1288) @dependabot
+- build(deps): Bump sigs.k8s.io/controller-runtime from 0.18.4 to 0.18.5 (#1295) @dependabot
+- build(deps): Bump golang from 1.22.5-alpine3.19 to 1.22.6-alpine3.19 in /cmd/fluent-watcher/fluentbit (#1289) @dependabot
+- build(deps): Bump golang from 1.22.5-alpine3.19 to 1.22.6-alpine3.19 in /cmd/fluent-watcher/fluentd (#1290) @dependabot
+- update fluentbit to v3.1.4 (#1282) @jiuxia211
+- Mention multiline parser CRDs in README (#1280) @reegnz
+- build(deps): Bump github.com/go-openapi/errors from 0.20.4 to 0.22.0 (#1274) @dependabot
+- build(deps): Bump golang from 1.22.0-alpine3.19 to 1.22.5-alpine3.19 in /cmd/fluent-watcher/fluentd (#1260) @dependabot
+- build(deps): Bump golang from 1.22.0-alpine3.19 to 1.22.5-alpine3.19 in /cmd/fluent-watcher/fluentbit (#1261) @dependabot
+- build(deps): Bump golang from 1.22.0-alpine3.19 to 1.22.5-alpine3.19 in /cmd/fluent-manager (#1262) @dependabot
+- build(deps): Bump fluent/fluent-bit from 3.1.3-debug to 3.1.4-debug in /cmd/fluent-watcher/fluentbit (#1266) @dependabot
+- build(deps): Bump fluent/fluent-bit from 3.1.2-debug to 3.1.3-debug in /cmd/fluent-watcher/fluentbit (#1245) @dependabot
+- build(deps): Bump golang from 1.22.3 to 1.22.4 in /docs/best-practice/forwarding-logs-via-http (#1227) @dependabot
+- build(deps): Bump k8s.io/client-go from 0.26.3 to 0.30.3 (#1254) @dependabot
+- build(deps): bump k8s.io/client-go, k8s.io/apimachinery, k8s.io/api, … (#1251) @jiuxia211
+- Bump fluentbit to 3.1.2. (#1240) @joshuabaird
+- build(deps): Bump fluent/fluent-bit from 3.1.0-debug to 3.1.2-debug in /cmd/fluent-watcher/fluentbit (#1238) @dependabot
+
+### BUGFIX
+- bug: Allows to render net properties for outputs (#1298) @dex4er
+- BUG: re-add accidently removed flag.Parse (#1294) @developer-guy
+- Fix service monitor label selector scope (#1284) @rmvangun
+- fix(rbac): Add missing rbac rules for namespaced fluentbit (#1265) @alexandrevilain
+- Fixes "build fluent operator" CI workflow (#1263) @joshuabaird
+- Fixes fluentd/fluent-bit image build CI workflows (#1259) @joshuabaird
+- Fix release name on fluentbit output loki (#1248) @yildizozan
+
 ## 3.0.0 / 2024-07-09
 ### Features
 - Feat: add daemonset terminationGracePeriodSeconds (#1204) @smallc2009

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.0
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.1.0-debug
+FB_IMG ?= kubesphere/fluent-bit:v3.1.5
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.1.5-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

README.md

@@ -133,7 +133,7 @@ Kubernetes v1.16.13+ is necessary for running Fluent Operator.
 Install the latest stable version
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/fluent/fluent-operator/release-3.0/manifests/setup/setup.yaml
+kubectl apply -f https://raw.githubusercontent.com/fluent/fluent-operator/release-3.1/manifests/setup/setup.yaml
 
 # You can change the namespace in manifests/setup/kustomization.yaml in corresponding release branch 
 # and then use command below to install to another namespace

RELEASE.md

@@ -43,6 +43,7 @@ This page describes the release process and the currently planned schedule for u
 | v2.8.0         | 2024-04-22             | Zhang Peng (GitHub: @Gentleelephant)  |
 | v2.9.0         | 2024-06-13             | Elon Cheng (GitHub: @wenchajun)       |
 | v3.0.0         | 2024-07-09             | Elon Cheng (GitHub: @wenchajun)       |
+| v3.1.0         | 2024-08-14             | Zhang Peng (GitHub: @Gentleelephant)  |
 
 # How to cut a new release
 

charts/fluent-operator/Chart.yaml

@@ -15,12 +15,12 @@ description: A Helm chart for Kubernetes
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.1
+version: 3.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 3.0.0
+appVersion: 3.1.0
 
 dependencies:
   - name: fluent-bit-crds

charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml

@@ -14,10 +14,10 @@ description: A Helm chart delivering fluenbt-bit controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0
+version: 3.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.0.0"
+appVersion: "3.1.0"

charts/fluent-operator/charts/fluentd-crds/Chart.yaml

@@ -14,10 +14,10 @@ description: A Helm chart delivering fluentd controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0
+version: 3.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.0.0"
+appVersion: "3.1.0"

charts/fluent-operator/values.yaml

@@ -83,7 +83,7 @@ fluentbit:
     metricRelabelings: []
   image:
     repository: "ghcr.io/fluent/fluent-operator/fluent-bit"
-    tag: "3.1.4"
+    tag: "3.1.5"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:

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.4
+FROM fluent/fluent-bit:3.1.5
 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/

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.4-debug
+FROM fluent/fluent-bit:3.1.5-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/

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.4
+  image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/

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.4
+  image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/

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.4
+  image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5
   fluentBitConfigName: fluent-bit-config
 
 ---

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.4
+  image: ghcr.io/fluent/fluent-operator/fluent-bit:3.1.5
   fluentBitConfigName: fluent-bit-config