Merge pull request #255 from wanjunlei/master

pre release v2.5.0
kubesphere · Mar 21, 2024 · acf51eb · acf51eb
2 parents c8ea398 + 98e665c
commit acf51eb
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/CHANGLOG.md b/CHANGLOG.md
@@ -1,3 +1,24 @@
+## v2.5.0 / 2024-03-21
+
+### FEATURES
+
+-  Support sending notification history without adaptor(#227). @wanjunlei
+-  New tenant sidecar for kubesphere v4.0.0(#231). @wanjunlei
+
+### Enhancements
+
+- Add receiver name to the notification(#235). @wanjunlei
+- Add annotation of alert to the notification(#238). @wanjunlei  
+- Update go version to 1.20(#236). @wanjunlei
+
+### Deprecations
+
+- Delete the v2beta1 version of the CRD(#230). @wanjunlei
+
+### Bugfix
+
+- Fix a bug that notification manager will crash when the smtp server is not available(#245). @Gentleelephant
+
 ## v2.4.0 / 2023-09-20
 
 ### 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.4.0/bundle.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/bundle.yaml
 # Deploy default template:
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/template.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/template.yaml
 # Deploy built-in language packs.
-kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.4.0/zh-cn.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/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.4.0/notification-manager.tgz
+helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/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.4.0/notification_manager.yaml
+kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.0/notification_manager.yaml
 ```
 
 ### Configure sender

diff --git a/RELEASE.md b/RELEASE.md
@@ -17,6 +17,8 @@ This page describes the release process and the currently planned schedule for u
 | v2.3.0-rc.0    | 2023-02-07             | leiwanjun (GitHub: @leiwanjun)      |
 | 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)      |
+
 
 # How to cut a new release
 

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2.4.0
+appVersion: 2.5.0
 description: Notification Manager manages notifications in multi-tenant K8s environment. It receives alerts or notifications from different senders and then send notifications to various tenant receivers based on alerts/notifications' tenant label like "namespace". 
 name: notification-manager
-version: 2.4.0
+version: 2.5.0
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -27,7 +27,7 @@ operator:
     operator:
       image:
         repo: kubesphere/notification-manager-operator
-        tag: v2.4.0
+        tag: v2.5.0
         pullPolicy: IfNotPresent
       resources:
         limits:
@@ -45,7 +45,7 @@ operator:
 notificationmanager:
   image:
     repo: kubesphere/notification-manager
-    tag: v2.4.0
+    tag: v2.5.0
     pullPolicy: IfNotPresent
   sidecar:
     image:

diff --git a/sidecar/kubesphere/4.0.0/Makefile b/sidecar/kubesphere/4.0.0/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a Apache license
 # that can be found in the LICENSE file.
 
-IMG ?= leiwanjun/notification-tenant-sidecar:v4.0.0
+IMG ?= kubesphere/notification-tenant-sidecar:v4.0.0
 AMD64 ?= -amd64
 
 all: docker-build