[stable/sentry] Support existingSecret for smtp-password (#10385)

Signed-off-by: Jyrno Ader <jyrno42@gmail.com>
This commit is contained in:
Jürno Ader
2019-01-15 11:01:13 -08:00
committed by Kubernetes Prow Robot
parent 056281c66d
commit 80d56393fe
7 changed files with 23 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Sentry is a cross-platform crash reporting and aggregation platform.
name: sentry
version: 1.0.1
version: 1.0.2
appVersion: 9.0
keywords:
- debugging
@@ -91,7 +91,11 @@ spec:
- name: SENTRY_EMAIL_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.email.existingSecret }}
name: {{ .Values.email.existingSecret }}
{{- else }}
name: {{ template "fullname" . }}
{{- end }}
key: smtp-password
- name: SENTRY_EMAIL_USE_TLS
value: {{ .Values.email.use_tls | quote }}
@@ -75,7 +75,11 @@ spec:
- name: SENTRY_EMAIL_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.email.existingSecret }}
name: {{ .Values.email.existingSecret }}
{{- else }}
name: {{ template "fullname" . }}
{{- end }}
key: smtp-password
- name: SENTRY_EMAIL_USE_TLS
value: {{ .Values.email.use_tls | quote }}
@@ -75,7 +75,11 @@ spec:
- name: SENTRY_EMAIL_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.email.existingSecret }}
name: {{ .Values.email.existingSecret }}
{{- else }}
name: {{ template "fullname" . }}
{{- end }}
key: smtp-password
- name: SENTRY_USER_PASSWORD
valueFrom:
+2
View File
@@ -14,7 +14,9 @@ data:
{{ else }}
sentry-secret: {{ randAlphaNum 40 | b64enc | quote }}
{{ end }}
{{- if not .Values.email.existingSecret }}
smtp-password: {{ default "" .Values.email.password | b64enc | quote }}
{{ end }}
{{ if .Values.user.password }}
user-password: {{ .Values.user.password | b64enc | quote }}
{{ else }}
@@ -90,7 +90,11 @@ spec:
- name: SENTRY_EMAIL_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.email.existingSecret }}
name: {{ .Values.email.existingSecret }}
{{- else }}
name: {{ template "fullname" . }}
{{- end }}
key: smtp-password
- name: SENTRY_EMAIL_USE_TLS
value: {{ .Values.email.use_tls | quote }}
@@ -91,7 +91,11 @@ spec:
- name: SENTRY_EMAIL_PASSWORD
valueFrom:
secretKeyRef:
{{- if .Values.email.existingSecret }}
name: {{ .Values.email.existingSecret }}
{{- else }}
name: {{ template "fullname" . }}
{{- end }}
key: smtp-password
- name: SENTRY_EMAIL_USE_TLS
value: {{ .Values.email.use_tls | quote }}