From efff8ee3d74146fcedfbd6fd4e6b3f0babb7186a Mon Sep 17 00:00:00 2001 From: Gentleelephant <1132960613@qq.com> Date: Mon, 30 Jun 2025 15:27:27 +0800 Subject: [PATCH] chore: update version to v2.6.0 and adjust related references Signed-off-by: Gentleelephant <1132960613@qq.com> --- CHANGLOG.md | 7 +++++++ README.md | 10 +++++----- RELEASE.md | 1 + VERSION | 2 +- config/bundle.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/samples/notification_manager.yaml | 2 +- helm/Chart.yaml | 4 ++-- helm/values.yaml | 4 ++-- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CHANGLOG.md b/CHANGLOG.md index 0c24e255..4045eb9b 100644 --- a/CHANGLOG.md +++ b/CHANGLOG.md @@ -1,3 +1,10 @@ +## v2.6.0 / 2025-06-30 + +### Enhancements + +- update actions/cache to v4 (#293) @wanjunlei +- update template (#296) @wanjunlei + ## v2.5.2 / 2024-05-14 ### Enhancements diff --git a/README.md b/README.md index 33485eed..6f149414 100644 --- 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.5.2/bundle.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.6.0/bundle.yaml # Deploy default template: -kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/template.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.6.0/template.yaml # Deploy built-in language packs. -kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.5.2/zh-cn.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.6.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.5.2/notification-manager.tgz +helm install notification-manager --create-namespace -n kubesphere-monitoring-system https://github.com/kubesphere/notification-manager/releases/download/v2.6.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.5.2/notification_manager.yaml +kubectl apply -f https://github.com/kubesphere/notification-manager/releases/download/v2.6.0/notification_manager.yaml ``` ### Configure sender diff --git a/RELEASE.md b/RELEASE.md index cb539c54..ad20cfd3 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -20,6 +20,7 @@ This page describes the release process and the currently planned schedule for u | v2.5.0 | 2024-03-21 | leiwanjun (GitHub: @leiwanjun) | | v2.5.1 | 2024-04-03 | leiwanjun (GitHub: @leiwanjun) | | v2.5.2 | 2024-04-14 | leiwanjun (GitHub: @leiwanjun) | +| v2.6.0 | 2025-06-30 | Gentleelephant (GitHub: @Gentleelephant) | # How to cut a new release diff --git a/VERSION b/VERSION index 98c31d46..7433fb30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.6.0-alpha.0 \ No newline at end of file +v2.6.0 \ No newline at end of file diff --git a/config/bundle.yaml b/config/bundle.yaml index 86c50ad7..25f6a6e9 100644 --- a/config/bundle.yaml +++ b/config/bundle.yaml @@ -8044,7 +8044,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: kubesphere/notification-manager-operator:latest + image: kubesphere/notification-manager-operator:v2.6.0 imagePullPolicy: Always name: notification-manager-operator ports: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c5de02c2..4062ee3f 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: latest + newTag: 2.6.0 diff --git a/config/samples/notification_manager.yaml b/config/samples/notification_manager.yaml index b9dc8aaa..b9ebb1e1 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:latest + image: kubesphere/notification-manager:v2.6.0 imagePullPolicy: Always serviceAccountName: notification-manager-sa portName: webhook diff --git a/helm/Chart.yaml b/helm/Chart.yaml index bb0406a1..d08440fc 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2.5.0 +appVersion: 2.6.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.5.0 +version: 2.6.0 diff --git a/helm/values.yaml b/helm/values.yaml index 6b29713e..517a3e4e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -27,7 +27,7 @@ operator: operator: image: repo: kubesphere/notification-manager-operator - tag: v2.5.0 + tag: v2.6.0 pullPolicy: IfNotPresent resources: limits: @@ -45,7 +45,7 @@ operator: notificationmanager: image: repo: kubesphere/notification-manager - tag: v2.5.0 + tag: v2.6.0 pullPolicy: IfNotPresent sidecar: image: