Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fluent-bit to 3.1.8 #1356

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-fb-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to modify it here as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean the kubesphere stuff? I want to handle fluent-operator in a separate PR as I'm also handling fluent-bit separately: #1357

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentbit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentbit/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion config/samples/fluentbit_v1alpha2_fluentbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion manifests/kubeedge/fluentbit-fluentbit-edge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion manifests/logging-stack/fluentbit-fluentBit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion manifests/quick-start/fluentbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

---
Expand Down
2 changes: 1 addition & 1 deletion manifests/regex-parser/fluentbit-fluentBit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading