Skip to content

Commit 8037a4e

Browse files
benjaminhuobenjaminhuo
authored
Merge pull request #269 from wanjunlei/release-2.5
release v2.5.2
2 parents e6ccf34 + ec8106d commit 8037a4e

File tree

9 files changed

+34
-13
lines changed

9 files changed

+34
-13
lines changed

‎CHANGLOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## v2.5.2 / 2024-05-14
2+
3+
### Enhancements
4+
5+
- support to get tenant info from multiple cluster (#263) @wanjunlei
6+
- trim space (#267) @Gentleelephant
7+
- update template (#264) @Gentleelephant
8+
- update helm template (#266) @wanjunlei
9+
- add alerttime to metric alert (#265) @wanjunlei
10+
11+
### Bugfix
12+
13+
- Fix Typo in documentation (#262) @mohamed-rafraf
14+
15+
### Update
16+
17+
- Bump google.golang.org/protobuf from 1.30.0 to 1.33.0 (#252) @dependabot
18+
- Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /sidecar/kubesphere/4.0.0 (#253) @dependabot
19+
- Bump golang.org/x/net from 0.17.0 to 0.23.0 in /sidecar/kubesphere/4.0.0 (#260) @dependabot
20+
- Bump golang.org/x/net from 0.17.0 to 0.23.0 (#261) @dependabot
21+
122
## v2.5.1 / 2024-04-03
223

324
### Bugfix

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@ We assume you already have a Kubernetes cluster (v1.16+). You can install one us
8282

8383
```shell
8484
# Deploy CRDs and the Notification Manager Operator:
85-
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.1/bundle.yaml
85+
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/bundle.yaml
8686
# Deploy default template:
87-
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.1/template.yaml
87+
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/template.yaml
8888
# Deploy built-in language packs.
89-
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.1/zh-cn.yaml
89+
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/zh-cn.yaml
9090
```
9191

9292
#### Install with helm
9393

9494
```shell
95-
helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.5.1/notification-manager.tgz
95+
helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/notification-manager.tgz
9696
```
9797

9898
### Configure NotificationManager
@@ -103,7 +103,7 @@ ensures a deployment meeting the resource requirements is running.
103103
We should create a NotificationManager CR first, skip this when using helm install.
104104

105105
```shell
106-
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.1/notification_manager.yaml
106+
kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/notification_manager.yaml
107107
```
108108

109109
### Configure sender

‎RELEASE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This page describes the release process and the currently planned schedule for u
1919
| v2.4.0 | 2023-09-20 | leiwanjun (GitHub: @leiwanjun) |
2020
| v2.5.0 | 2024-03-21 | leiwanjun (GitHub: @leiwanjun) |
2121
| v2.5.1 | 2024-04-03 | leiwanjun (GitHub: @leiwanjun) |
22+
| v2.5.2 | 2024-04-14 | leiwanjun (GitHub: @leiwanjun) |
2223

2324

2425
# How to cut a new release

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.5.1
1+
v2.5.2

‎config/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8044,7 +8044,7 @@ spec:
80448044
fieldRef:
80458045
apiVersion: v1
80468046
fieldPath: metadata.namespace
8047-
image: kubesphere/notification-manager-operator:v2.5.1
8047+
image: kubesphere/notification-manager-operator:v2.5.2
80488048
imagePullPolicy: Always
80498049
name: notification-manager-operator
80508050
ports:

‎config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: kubesphere/notification-manager-operator
8-
newTag: v2.5.1
8+
newTag: v2.5.2

‎config/samples/bundle.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ data:
55
{{ define "nm.default.message.cn" }}{{ if ne (len .Status) 0 }}[{{ .Status | translate }}] {{ end }}{{ .MessageCN }}{{ end }}
66
77
{{ define "nm.default.subject" }}{{ if eq (len .Alerts) 1 }}{{ range .Alerts }}{{ template "nm.default.message" . }}{{ end }}{{ else }}{{ .Alerts | len }} {{ if ne (len .Status) 0 }}{{ .Status }} {{ end }}alerts{{ if gt (len .GroupLabels.SortedPairs) 0 }} for {{ range .GroupLabels.SortedPairs }}{{ .Name | translate }}={{ .Value }} {{ end }}{{ end }}{{ end }}{{ end }}
8-
{{ define "nm.subject" }}{{ .Alerts | len }} {{ if ne (len .Status) 0 }}{{ .Status }} {{ end }}alerts{{ if gt (len .CommonLabels.SortedPairs) 0 }} for {{ range .CommonLabels.SortedPairs }}{{ .Name | translate }}={{ .Value }} {{ end }}{{ end }}{{ end }}
9-
8+
{{ define "nm.subject" -}}{{- $rawStatus := .Status -}}{{- $severity := index .CommonLabels "severity" -}}{{- $status := "" -}}{{- if eq $rawStatus "firing" -}}{{- $status = "FIRING" -}}{{- else if eq $rawStatus "resolved" -}}{{- $status = "RESOLVED" -}}{{- else -}}{{- $status = "UNKNOWN" -}}{{- end -}}{{- $numAlerts := len .Alerts -}}{{- if eq $numAlerts 0 -}}Show nothing{{- else if eq $numAlerts 1 -}}{{- range .Alerts -}}{{- $alertType := .Labels.alerttype -}}{{- $alertName := .Labels.alertname -}}{{- $cluster := .Labels.cluster -}}{{- $node := .Labels.node -}}{{- $pod := .Labels.pod -}}{{- $namespace := .Labels.namespace -}}{{- $output := printf "[%s]" $status -}}{{- if $severity -}}{{- $output = printf "%s | severity=%s" $output $severity -}}{{- end -}}{{- if $alertType -}}{{- $output = printf "%s | alerttype=%s" $output $alertType -}}{{- end -}}{{- if $alertName -}}{{- $output = printf "%s | alertname=%s" $output $alertName -}}{{- end -}}{{- if $cluster -}}{{- $output = printf "%s | cluster=%s" $output $cluster -}}{{- end -}}{{- if $node -}}{{- $output = printf "%s | node=%s" $output $node -}}{{- end -}}{{- if $namespace -}}{{- $output = printf "%s | namespace=%s" $output $namespace -}}{{- end -}}{{- if $pod -}}{{- $output = printf "%s | pod=%s" $output $pod -}}{{- end -}}{{- $output -}}{{- end -}}{{- else -}}{{- $alertType := index .GroupLabels "alerttype" -}}{{- $alertName := index .GroupLabels "alertname" -}}{{- $cluster := index .GroupLabels "cluster" -}}{{- $namespace := index .GroupLabels "namespace" -}}{{- $node := index .GroupLabels "node" -}}{{- $output := printf "[%s]" $status -}}{{- if $severity -}}{{- $output = printf "%s | severity=%s" $output $severity -}}{{- end -}}{{- if $alertType -}}{{- $output = printf "%s | alerttype=%s" $output $alertType -}}{{- end -}}{{- if $alertName -}}{{- $output = printf "%s | alertname=%s" $output $alertName -}}{{- end -}}{{- if $cluster -}}{{- $output = printf "%s | cluster=%s" $output $cluster -}}{{- end -}}{{- if $namespace -}}{{- $output = printf "%s | namespace=%s" $output $namespace -}}{{- end -}}{{- if $node -}}{{- $output = printf "%s | node=%s" $output $node -}}{{- end -}}{{- $output -}}{{- end -}}{{- end -}}
109
{{ define "nm.default.text" }}{{ range .Alerts }}{{ template "nm.default.message" . }}
1110
{{ range .Labels.SortedPairs }} {{ .Name | translate }}: {{ .Value }}
1211
{{ end }}{{ range .Annotations.SortedPairs.Filter "runbook_url" "message" "summary" "summary_cn" }} {{ .Name | translate }}: {{ .Value }}

‎config/samples/notification_manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
requests:
1212
cpu: 100m
1313
memory: 20Mi
14-
image: kubesphere/notification-manager:latest
14+
image: kubesphere/notification-manager:v2.5.2
1515
imagePullPolicy: Always
1616
serviceAccountName: notification-manager-sa
1717
portName: webhook

‎helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ operator:
2828
operator:
2929
image:
3030
repo: kubesphere/notification-manager-operator
31-
tag: v2.5.1
31+
tag: v2.5.2
3232
pullPolicy: IfNotPresent
3333
resources:
3434
limits:
@@ -46,7 +46,7 @@ operator:
4646
notificationmanager:
4747
image:
4848
repo: kubesphere/notification-manager
49-
tag: v2.5.1
49+
tag: v2.5.2
5050
pullPolicy: IfNotPresent
5151
sidecar:
5252
image:

0 commit comments

Comments
 (0)