diff --git a/helm/templates/notificationmanagers.yaml b/helm/templates/notificationmanagers.yaml index 2a20fce..b8c6f8f 100644 --- 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 index 76b8cba..8888373 100644 --- 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