Merge pull request #286 from wenchajun/release-1.0.1

Release 1.0.1
fluent · May 12, 2022 · 4f46525 · 4f46525
2 parents ed3640b + 82a5f17
commit 4f46525
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
@@ -13,7 +13,7 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v1.8.11'
+  FB_IMG: 'kubesphere/fluent-bit:v1.9.3'
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.0.1 / 2022-05-10
+## 1.0.1 / 2022-05-12
 
 ### ENHANCEMENT
 - Add utils related unit tests  (#251) 
@@ -8,6 +8,7 @@
 
 ### BUGFIX
 - Fix the bug of feature request issue will closed by mistake (#257) 
+- Fix crio init container mount path (#260) 
 - Fix version error (#261) 
 - Fix Helm Chart for Fluentd resources settings (#271) 
 - Fix reload error (#277) 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v1.8.11
+FB_IMG ?= kubesphere/fluent-bit:v1.9.3
 FD_IMG ?= kubesphere/fluentd:v1.14.4
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -23,7 +23,7 @@ This page describes the release process and the currently planned schedule for u
 | v0.12.0          | 2021-09-13                                 | Wanjun Lei (GitHub: @wanjunlei)         |
 | v0.13.0          | 2022-03-14                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v1.0.0           | 2022-03-25                                 | Elon Cheng (GitHub: @wenchajun)         |
-| v1.0.1           | 2022-05-10                                 | Elon Cheng (GitHub: @wenchajun)         |
+| v1.0.1           | 2022-05-12                                 | Elon Cheng (GitHub: @wenchajun)         |
 
 # How to cut a new release
 

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -66,7 +66,7 @@ spec:
           echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.crio }} > /fluent-operator/fluent-bit.env
         volumeMounts:
         - name: env
-          mountPath: /fluentbit-operator
+          mountPath: /fluent-operator
       {{- end }}
       containers:
       - name: fluent-operator
@@ -86,4 +86,4 @@ spec:
       {{- if .Values.operator.imagePullSecrets }}
       imagePullSecrets:
       {{ toYaml .Values.operator.imagePullSecrets | indent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -32,7 +32,7 @@ operator:
 fluentbit:
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v1.8.11"
+    tag: "v1.9.3"
   # 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
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:1.8.11
+FROM fluent/fluent-bit:1.9.3
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/