diff --git a/CHANGLOG.md b/CHANGLOG.md index 6f1fc855..77fd97c8 100644 --- a/CHANGLOG.md +++ b/CHANGLOG.md @@ -1,3 +1,9 @@ +## v2.3.0 / 2023-04-12 + +### Enhancements + +- Optimize the logic of notification history(#193). @wanjunlei + ## v2.3.0-rc.0 / 2023-02-07 ### Enhancements diff --git a/PROJECT b/PROJECT index 85265e91..07ef801c 100644 --- a/PROJECT +++ b/PROJECT @@ -3,32 +3,17 @@ repo: github.com/kubesphere/notification-manager resources: - group: notification kind: NotificationManager - version: v1alpha1 + version: v2beta2 - group: notification - kind: EmailConfig - version: v1alpha1 -- group: notification - kind: EmailReceiver - version: v1alpha1 + kind: Config + version: v2beta2 - group: notification kind: Receiver - version: v1alpha1 -- group: notification - kind: SlackConfig - version: v1alpha1 -- group: notification - kind: SlackReceiver - version: v1alpha1 -- group: notification - kind: WebhookConfig - version: v1alpha1 -- group: notification - kind: WebhookReceiver - version: v1alpha1 + version: v2beta2 - group: notification - kind: WechatConfig - version: v1alpha1 + kind: Router + version: v2beta2 - group: notification - kind: WechatReceiver - version: v1alpha1 + kind: Silence + version: v2beta2 version: "2" diff --git a/README.md b/README.md index 060ac873..6b2ee423 100644 --- a/README.md +++ b/README.md @@ -81,17 +81,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.3.0-rc.0/bundle.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/bundle.yaml # Deploy default template: -kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0-rc.0/template.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/template.yaml # Deploy built-in language packs. -kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0-rc.0/zh-cn.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.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.3.0-rc.0/notification-manager.tgz +helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/notification-manager.tgz ``` ### Configure NotificationManager @@ -102,7 +102,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.3.0-rc.0/notification_manager.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.3.0/notification_manager.yaml ``` ### Configure sender diff --git a/RELEASE.md b/RELEASE.md index cd8bd271..b9f3ea86 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -15,6 +15,7 @@ This page describes the release process and the currently planned schedule for u | v2.1.0 | 2022-11-29 | leiwanjun (GitHub: @leiwanjun) | | v2.2.0 | 2023-01-06 | Gentleelephant (GitHub: @Gentleelephant) | | v2.3.0-rc.0 | 2023-02-07 | leiwanjun (GitHub: @leiwanjun) | +| v2.3.0 | 2023-04-12 | leiwanjun (GitHub: @leiwanjun) | # How to cut a new release diff --git a/VERSION b/VERSION index 09754f0c..a6316f06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.3.0-rc.0 \ No newline at end of file +v2.3.0 \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0514393a..c91535d5 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: kubesphere/notification-manager-operator - newTag: v2.3.0-rc.0 + newTag: v2.3.0 diff --git a/config/samples/bundle.yaml b/config/samples/bundle.yaml index 737cdc3c..77c0c3ae 100644 --- a/config/samples/bundle.yaml +++ b/config/samples/bundle.yaml @@ -185,7 +185,7 @@ spec: groupLabels: - alertname - namespace - image: kubesphere/notification-manager:latest + image: kubesphere/notification-manager:v2.3.0 imagePullPolicy: Always portName: webhook receivers: diff --git a/config/samples/notification_manager.yaml b/config/samples/notification_manager.yaml index 4e38e9ad..067c460f 100644 --- a/config/samples/notification_manager.yaml +++ b/config/samples/notification_manager.yaml @@ -11,7 +11,7 @@ spec: requests: cpu: 100m memory: 20Mi - image: kubesphere/notification-manager:v2.3.0-rc.0 + image: kubesphere/notification-manager:v2.3.0 imagePullPolicy: Always serviceAccountName: notification-manager-sa portName: webhook diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 0bcba809..ffeafda6 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2.2.0 +appVersion: 2.3.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.2.0 +version: 2.3.0 diff --git a/helm/values.yaml b/helm/values.yaml index a6f19ce7..947cc5cd 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -30,7 +30,7 @@ operator: operator: image: repo: kubesphere/notification-manager-operator - tag: v2.3.0-rc.0 + tag: v2.3.0 pullPolicy: IfNotPresent resources: limits: @@ -48,7 +48,7 @@ operator: notificationmanager: image: repo: kubesphere/notification-manager - tag: v2.3.0-rc.0 + tag: v2.3.0 pullPolicy: IfNotPresent replicas: 1 resources: