update helm

Signed-off-by: wanjunlei <[email protected]>
kubesphere · Dec 15, 2023 · 42b822b · 42b822b
1 parent 6dcf2d4
commit 42b822b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/helm/templates/notificationmanagers.yaml b/helm/templates/notificationmanagers.yaml
@@ -35,13 +35,8 @@ spec:
     {{- toYaml .Values.notificationmanager.volumes | nindent 4 }}
   defaultSecretNamespace:
     {{- toYaml .Values.notificationmanager.defaultSecretNamespace | nindent 4 }}
-  {{- if eq .Values.kubesphere true }}
   sidecars:
-    tenant:
-      image: kubesphere/notification-tenant-sidecar:v3.2.0
-      name: tenant
-      type: kubesphere
-  {{- end}}
+    {{- toYaml .Values.notificationmanager.sidecars | nindent 4 }}
   template:
     {{- toYaml .Values.notificationmanager.template | nindent 4 }}
   groupLabels:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,17 +1,3 @@
-# Whether Notification manager is running at the kubesphere.
-kubesphere: false
-
-hook:
-  postInstall:
-    image:
-      repo: kubesphere/kubectl
-      tag: v1.22.0
-      pullPolicy: IfNotPresent
-    backoffLimit: 1
-
-# Set timezone to be injected into containers
-# timezone: "America/Toronto"
-
 # value of notification-manager-operator
 operator: 
   containers:
@@ -92,3 +78,9 @@ notificationmanager:
   env:
     - name: TZ
       value: Asia/Shanghai
+# set when using kubesphere
+#  sidecars:
+#    tenant:
+#      image: kubesphere/notification-tenant-sidecar:v3.2.0
+#      name: tenant
+#      type: kubesphere