fix bug the template generate notification error

Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>

Makefile

@@ -73,7 +73,7 @@ manifests: controller-gen
 	cd config/manager && kustomize edit set image controller=${IMG} && cd ../../
 	kustomize build config/default | sed -e '/creationTimestamp/d' > config/bundle.yaml
 	kustomize build config/samples | sed -e '/creationTimestamp/d' > config/samples/bundle.yaml
-	cp -r ./config/crd/bases/* ./helm/crds/
+	kustomize build config/helm | sed -e '/creationTimestamp/d' > helm/crds/bundle.yaml
 
 # Run go fmt against code
 fmt:

config/helm/kustomization.yaml

@@ -0,0 +1,16 @@
+# Adds namespace to all resources.
+namespace: kubesphere-monitoring-system
+
+# Value of this field is prepended to the
+# names of all resources, e.g. a deployment named
+# "wordpress" becomes "alices-wordpress".
+# Note that it should also match with the prefix (text before '-') of the namespace
+# field above.
+namePrefix: notification-manager-
+
+# Labels to add to all resources and selectors.
+#commonLabels:
+#  someName: someValue
+
+bases:
+- ../crd

helm/templates/notificationmanagers.yaml

@@ -32,9 +32,10 @@ spec:
     {{- toYaml .Values.notificationmanager.defaultSecretNamespace | nindent 4 }}
   {{- if eq .Values.kubesphere true }}
   sidecars:
-    image: kubesphere/notification-tenant-sidecar:v3.2.0
-    name: tenant
-    type: kubesphere
+    tenant:
+      image: kubesphere/notification-tenant-sidecar:v3.2.0
+      name: tenant
+      type: kubesphere
   {{- end}}
   template:
     {{- toYaml .Values.notificationmanager.template | nindent 4 }}

pkg/constants/constants.go

@@ -26,8 +26,8 @@ const (
 	AlertResolved = "resolved"
 
 	AlertName      = "alertname"
-	AlertType      = "alertype"
-	AlertTime      = "alertime"
+	AlertType      = "alerttype"
+	AlertTime      = "alerttime"
 	AlertMessage   = "message"
 	AlertSummary   = "summary"
 	AlertSummaryCN = "summaryCn"

pkg/template/template.go

@@ -189,8 +189,13 @@ func (t *Template) Html(name string, data *Data) (string, error) {
 
 // Delete all `space`, `LF`, `CR` at the end of string.
 func cleanSuffix(s string) string {
+
 	for {
 		l := len(s)
+		if l == 0 {
+			return s
+		}
+
 		if byte(s[l-1]) == 10 || byte(s[l-1]) == 13 || byte(s[l-1]) == 32 {
 			s = s[:l-1]
 		} else {
@@ -225,14 +230,14 @@ func (t *Template) Split(data *Data, maxSize int, templateName string, subjectTe
 	for i := 0; i < len(data.Alerts); i++ {
 
 		d.Alerts = append(d.Alerts, data.Alerts[i])
-		msg, err := t.Text(templateName, d.Format())
+		msg, err := t.Text(t.transform(templateName), d.Format())
 		if err != nil {
 			return nil, nil, err
 		}
 
 		subject := ""
 		if subjectTemplateName != "" {
-			subject, err = t.Text(templateName, d)
+			subject, err = t.Text(t.transform(subjectTemplateName), d)
 			if err != nil {
 				return nil, nil, err
 			}