Skip to content

Commit 4f46525

Browse files
authored
Merge pull request #286 from wenchajun/release-1.0.1
Release 1.0.1
2 parents ed3640b + 82a5f17 commit 4f46525

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

.github/workflows/build-fb-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- "pkg/filenotify/**"
1414

1515
env:
16-
FB_IMG: 'kubesphere/fluent-bit:v1.8.11'
16+
FB_IMG: 'kubesphere/fluent-bit:v1.9.3'
1717

1818
jobs:
1919
build:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.0.1 / 2022-05-10
1+
## 1.0.1 / 2022-05-12
22

33
### ENHANCEMENT
44
- Add utils related unit tests (#251)
@@ -8,6 +8,7 @@
88

99
### BUGFIX
1010
- Fix the bug of feature request issue will closed by mistake (#257)
11+
- Fix crio init container mount path (#260)
1112
- Fix version error (#261)
1213
- Fix Helm Chart for Fluentd resources settings (#271)
1314
- Fix reload error (#277)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
22
# Image URL to use all building/pushing image targets
3-
FB_IMG ?= kubesphere/fluent-bit:v1.8.11
3+
FB_IMG ?= kubesphere/fluent-bit:v1.9.3
44
FD_IMG ?= kubesphere/fluentd:v1.14.4
55
FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
66

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This page describes the release process and the currently planned schedule for u
2323
| v0.12.0 | 2021-09-13 | Wanjun Lei (GitHub: @wanjunlei) |
2424
| v0.13.0 | 2022-03-14 | Elon Cheng (GitHub: @wenchajun) |
2525
| v1.0.0 | 2022-03-25 | Elon Cheng (GitHub: @wenchajun) |
26-
| v1.0.1 | 2022-05-10 | Elon Cheng (GitHub: @wenchajun) |
26+
| v1.0.1 | 2022-05-12 | Elon Cheng (GitHub: @wenchajun) |
2727

2828
# How to cut a new release
2929

charts/fluent-operator/templates/fluent-operator-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.crio }} > /fluent-operator/fluent-bit.env
6767
volumeMounts:
6868
- name: env
69-
mountPath: /fluentbit-operator
69+
mountPath: /fluent-operator
7070
{{- end }}
7171
containers:
7272
- name: fluent-operator
@@ -86,4 +86,4 @@ spec:
8686
{{- if .Values.operator.imagePullSecrets }}
8787
imagePullSecrets:
8888
{{ toYaml .Values.operator.imagePullSecrets | indent 8 }}
89-
{{- end }}
89+
{{- end }}

charts/fluent-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ operator:
3232
fluentbit:
3333
image:
3434
repository: "kubesphere/fluent-bit"
35-
tag: "v1.8.11"
35+
tag: "v1.9.3"
3636
# fluentbit resources. If you do want to specify resources, adjust them as necessary
3737
#You can adjust it based on the log volume.
3838
resources:

cmd/fluent-watcher/fluentbit/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKDIR /code
66
RUN echo $(ls -al /code)
77
RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
88

9-
FROM fluent/fluent-bit:1.8.11
9+
FROM fluent/fluent-bit:1.9.3
1010
LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
1111

1212
COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/

0 commit comments

Comments
 (0)