Merge pull request #270 from wanjunlei/master

update to v2.5.2
kubesphere · May 14, 2024 · 5427718 · 5427718
2 parents 8c733da + 333be7d
commit 5427718
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/CHANGLOG.md b/CHANGLOG.md
@@ -1,3 +1,30 @@
+## v2.5.2 / 2024-05-14
+
+### Enhancements
+
+- support to get tenant info from multiple cluster (#263) @wanjunlei
+- trim space (#267) @Gentleelephant
+- update template (#264) @Gentleelephant
+- update helm template (#266) @wanjunlei
+- add alerttime to metric alert (#265) @wanjunlei
+
+### Bugfix
+
+- Fix Typo in documentation (#262) @mohamed-rafraf
+
+### Update
+
+- Bump google.golang.org/protobuf from 1.30.0 to 1.33.0 (#252) @dependabot
+- Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /sidecar/kubesphere/4.0.0 (#253) @dependabot
+- Bump golang.org/x/net from 0.17.0 to 0.23.0 in /sidecar/kubesphere/4.0.0 (#260) @dependabot
+- Bump golang.org/x/net from 0.17.0 to 0.23.0 (#261) @dependabot
+
+## v2.5.1 / 2024-04-03
+
+### Bugfix
+
+- fix bug regex silence will silence all alerts(#257). @wanjunlei
+
 ## v2.5.0 / 2024-03-21
 
 ### FEATURES

diff --git a/README.md b/README.md
@@ -82,17 +82,17 @@ We assume you already have a Kubernetes cluster (v1.16+). You can install one us
 
 ```shell
 # Deploy CRDs and the Notification Manager Operator:
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/bundle.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/bundle.yaml
 # Deploy default template:
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/template.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/template.yaml
 # Deploy built-in language packs.
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/zh-cn.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/zh-cn.yaml
 ```
 
 #### Install with helm
 
 ```shell
-helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/notification-manager.tgz
+helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/notification-manager.tgz
 ```
 
 ### Configure NotificationManager 
@@ -103,7 +103,7 @@ ensures a deployment meeting the resource requirements is running.
 We should create a NotificationManager CR first, skip this when using helm install.
 
 ```shell
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/notification_manager.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/notification_manager.yaml
 ```
 
 ### Configure sender

diff --git a/RELEASE.md b/RELEASE.md
@@ -18,7 +18,8 @@ This page describes the release process and the currently planned schedule for u
 | v2.3.0         | 2023-04-12             | leiwanjun (GitHub: @leiwanjun)      |
 | v2.4.0         | 2023-09-20             | leiwanjun (GitHub: @leiwanjun)      |
 | v2.5.0         | 2024-03-21             | leiwanjun (GitHub: @leiwanjun)      |
-
+| v2.5.1         | 2024-04-03             | leiwanjun (GitHub: @leiwanjun)      |
+| v2.5.2         | 2024-04-14             | leiwanjun (GitHub: @leiwanjun)      |
 
 # How to cut a new release