Merge pull request #78 from wanjunlei/release-0.7

Benjamin Huo · web-flow · commit 0428fb7b6773 · 2021-07-08T21:24:28.000+08:00
update CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - [ENHANCEMENT] fluent-bit-watcher: goroutine synchronization improvements. #74
 - [CHANGE] add hostpath to sample configurations and manifests. #72
+- [BUGFIX] Fix bug operator may crash when load plugin. #77
 
 ## 0.7.0 / 2021-06-29
 
diff --git a/Makefile b/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 ?= kubespheredev/fluent-bit:v1.7.3
-OP_IMG ?= kubespheredev/fluentbit-operator:v0.7.1
+OP_IMG ?= kubespheredev/fluentbit-operator:$(VERSION)
 MIGRATOR_IMG ?= kubespheredev/fluentbit-operator:migrator
 AMD64 ?= -amd64
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
diff --git a/RELEASE.md b/RELEASE.md
@@ -11,6 +11,10 @@ This page describes the release process and the currently planned schedule for u
 | v0.3.0           | 2020-11-10                                 | Guangzhe Huang (GitHub: @huanggze)     |
 | v0.4.0           | 2021-04-01                                 | Wanjun Lei (GitHub: @wanjunlei) |
 | v0.5.0           | 2021-04-14                                 | Wanjun Lei (GitHub: @wanjunlei)         |
+| v0.6.0           | 2021-06-03                                 | Wanjun Lei (GitHub: @wanjunlei)         |
+| v0.6.1           | 2021-06-11                                 | Benjamin Huo (GitHub: @benjaminhuo)         |
+| v0.6.2           | 2021-06-11                                 | Benjamin Huo (GitHub: @benjaminhuo)     |
+| v0.7.0           | 2021-06-29                                 | Wanjun Lei (GitHub: @wanjunlei)         |
 
 ## How to cut an individual release
 
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+v0.7.1
