Merge pull request #247 from Gentleelephant/release-2.5-fix-issue2927…

…-2921 fix bug
kubesphere · Mar 5, 2024 · 0b85773 · 0b85773
2 parents 1e666bd + b69aee5
commit 0b85773
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.5.0-rc.1
+v2.5.0-rc.2
diff --git a/helm/templates/zh-cn.yaml b/helm/templates/zh-cn.yaml
@@ -34,6 +34,9 @@ data:
         rule_group: "规则组"
         rule_level: "规则级别"
         name: "名称"
+        receiver: "接收者"
+        workload_type: "工作负载类型"
+        rule_type: "规则类型"
 kind: ConfigMap
 metadata:
   name: zh-cn

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -28,7 +28,7 @@ operator:
     operator:
       image:
         repo: kubesphere/notification-manager-operator
-        tag: v2.5.0-rc.1
+        tag: v2.5.0-rc.2
         pullPolicy: IfNotPresent
       resources:
         limits:
@@ -55,7 +55,7 @@ notificationmanager:
           memory: 256Mi
   image:
     repo: kubesphere/notification-manager
-    tag: v2.5.0-rc.1
+    tag: v2.5.0-rc.2
     pullPolicy: IfNotPresent
   sidecar:
     image:

diff --git a/pkg/notify/notifier/email/email.go b/pkg/notify/notifier/email/email.go
@@ -203,6 +203,9 @@ func (n *Notifier) send(ctx context.Context, to, subject, body string) error {
 	if err != nil {
 		return err
 	}
+	if conn == nil {
+		return utils.Errorf("failed to connect to %s", addr)
+	}
 
 	c, err := smtp.NewClient(conn, n.receiver.SmartHost.Host)
 	if err != nil {