Merge pull request #242 from Gentleelephant/release-2.5-2-29

update notification chart

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2.4.0
+appVersion: 2.5.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.4.0
+version: 2.5.0

helm/templates/notificationmanagers.yaml

@@ -45,6 +45,13 @@ spec:
   {{- end }}
       name: tenant
       type: kubesphere
+      resources:
+        limits:
+          cpu: {{ .Values.notificationmanager.sidecar.tenant.resources.limits.cpu }}
+          memory: {{ .Values.notificationmanager.sidecar.tenant.resources.limits.memory }}
+        requests:
+          cpu: {{  .Values.notificationmanager.sidecar.tenant.resources.requests.cpu }}
+          memory: {{  .Values.notificationmanager.sidecar.tenant.resources.requests.memory }}
   {{- end }}
   template:
     {{- toYaml .Values.notificationmanager.template | nindent 4 }}

helm/values.yaml

@@ -23,7 +23,7 @@ operator:
     operator:
       image:
         repo: kubesphere/notification-manager-operator
-        tag: v2.5.0-rc.0
+        tag: v2.5.0-rc.1
         pullPolicy: IfNotPresent
       resources:
         limits:
@@ -39,9 +39,18 @@ operator:
 
 # value of notification-manager
 notificationmanager:
+  sidecar:
+    tenant:
+      resources:
+        limits:
+          cpu: 200m
+          memory: 256Mi
+        requests:
+          cpu: 200m
+          memory: 256Mi
   image:
     repo: kubesphere/notification-manager
-    tag: v2.5.0-rc.0
+    tag: v2.5.0-rc.1
     pullPolicy: IfNotPresent
   replicas: 1
   resources: