Skip to content

Commit

Permalink
Merge pull request #767 from wenchajun/2.1.4
Browse files Browse the repository at this point in the history
Fluent-bit upgrade to v2.1.4
  • Loading branch information
benjaminhuo authored Jun 2, 2023
2 parents b3f1f87 + 4d05bc5 commit 473a7d5
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-fb-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
- "pkg/filenotify/**"

env:
FB_IMG: 'kubesphere/fluent-bit:v2.1.3'
FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.3-debug'
FB_IMG: 'kubesphere/fluent-bit:v2.1.4'
FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.4-debug'

jobs:
build:
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:v2.1.3
FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.3-debug
FB_IMG ?= kubesphere/fluent-bit:v2.1.4
FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.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
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 @@ -61,7 +61,7 @@ fluentbit:
enable: true
image:
repository: "kubesphere/fluent-bit"
tag: "v2.1.3"
tag: "v2.1.4"
# 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:2.1.3
FROM fluent/fluent-bit:2.1.4
LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"

COPY conf/fluent-bit.conf 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:2.1.3-debug
FROM fluent/fluent-bit:2.1.4-debug
LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"

COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
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: kubesphere/fluent-bit:v2.1.3
image: kubesphere/fluent-bit:v2.1.4
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: kubesphere/fluent-bit:v2.1.3
image: kubesphere/fluent-bit:v2.1.4
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: kubesphere/fluent-bit:v2.1.3
image: kubesphere/fluent-bit:v2.1.4
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: kubesphere/fluent-bit:v2.1.3
image: kubesphere/fluent-bit:v2.1.4
fluentBitConfigName: fluent-bit-config

0 comments on commit 473a7d5

Please sign in to comment.