update image tag handling to default to chart app version (#299)

* fix: update image tag handling to default to chart app version

Signed-off-by: Gentleelephant <[email protected]>

* chore: update version to v2.6.0 and adjust related references

Signed-off-by: Gentleelephant <[email protected]>

---------

Signed-off-by: Gentleelephant <[email protected]>

Author: Gentleelephant

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

README.md

@@ -82,11 +82,11 @@ 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
@@ -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

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
 

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

helm/templates/notificationmanagers.yaml

@@ -8,7 +8,7 @@ spec:
   {{- if .Values.notificationmanager.replicas }}
   replicas: {{ .Values.notificationmanager.replicas }}
   {{- end}}
-  image: {{ include "global.imageRegistry" .}}{{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag }}
+  image: {{ include "global.imageRegistry" .}}{{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag | default (printf "v%s" .Chart.AppVersion) }}
   imagePullPolicy: {{ .Values.notificationmanager.image.pullPolicy }}
   serviceAccountName: notification-manager-sa
   portName: webhook

helm/templates/operator.yaml

@@ -47,7 +47,7 @@ spec:
         - name: TZ
           value: {{ .Values.timezone }}
         {{- end }}
-        image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag }}
+        image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag | default (printf "v%s" .Chart.AppVersion) }}
         imagePullPolicy: {{ .Values.operator.containers.operator.image.pullPolicy }}
         name: notification-manager-operator
         ports:

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: