Merge branch 'master' into rollouts_resources
This commit is contained in:
commit
2b4c7b7920
8 changed files with 42 additions and 4 deletions
|
@ -3,7 +3,7 @@ appVersion: 0.7.0
|
||||||
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
||||||
name: argocd-notifications
|
name: argocd-notifications
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.5
|
version: 1.0.7
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||||
keywords:
|
keywords:
|
||||||
|
|
|
@ -87,7 +87,7 @@ Create the name of the bot service account to use
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "argocd-notifications.bots.slack.serviceAccountName" -}}
|
{{- define "argocd-notifications.bots.slack.serviceAccountName" -}}
|
||||||
{{- if .Values.bots.slack.serviceAccount.create -}}
|
{{- if .Values.bots.slack.serviceAccount.create -}}
|
||||||
{{ default (include "argocd-notifications.fullname" .) .Values.bots.slack.serviceAccount.name }}
|
{{ default (printf "%s-bot" (include "argocd-notifications.fullname" .)) .Values.bots.slack.serviceAccount.name }}
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
{{ default "default" .Values.bots.slack.serviceAccount.name }}
|
{{ default "default" .Values.bots.slack.serviceAccount.name }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -20,7 +20,7 @@ spec:
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
serviceAccountName: {{ include "argocd-notifications.serviceAccountName" . }}-bot
|
serviceAccountName: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ include "argocd-notifications.name" . }}-bot
|
- name: {{ include "argocd-notifications.name" . }}-bot
|
||||||
image: "{{ .Values.bots.slack.image.repository }}:{{ .Values.bots.slack.image.tag }}"
|
image: "{{ .Values.bots.slack.image.repository }}:{{ .Values.bots.slack.image.tag }}"
|
||||||
|
|
|
@ -15,4 +15,13 @@ rules:
|
||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
- patch
|
- patch
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- secrets
|
||||||
|
- configmaps
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{ if and .Values.bots.slack.enabled .Values.secret.create }}
|
{{- if .Values.bots.slack.serviceAccount.create }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -27,4 +27,13 @@ stringData:
|
||||||
{{- $v | toYaml | nindent 8 }}
|
{{- $v | toYaml | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.secret.notifiers.email.enabled }}
|
||||||
|
email:
|
||||||
|
host: {{ .Values.secret.notifiers.email.host | quote }}
|
||||||
|
port: {{ .Values.secret.notifiers.email.port }}
|
||||||
|
insecure_skip_verify: {{ .Values.secret.notifiers.email.insecure_skip_verify }}
|
||||||
|
username: {{ .Values.secret.notifiers.email.username | quote }}
|
||||||
|
password: {{ .Values.secret.notifiers.email.password | quote }}
|
||||||
|
from: {{ .Values.secret.notifiers.email.from | quote }}
|
||||||
|
{{- end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
|
{{- if .Values.serviceAccount.create }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argocd-notifications.serviceAccountName" . }}
|
name: {{ include "argocd-notifications.serviceAccountName" . }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "argocd-notifications.labels" . | nindent 4 }}
|
{{- include "argocd-notifications.labels" . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -69,6 +69,24 @@ secret:
|
||||||
# username: username
|
# username: username
|
||||||
# password: mypassword
|
# password: mypassword
|
||||||
|
|
||||||
|
email:
|
||||||
|
# For more information: https://argoproj-labs.github.io/argocd-notifications/services/overview/
|
||||||
|
|
||||||
|
# Specifies whether email notifier should be configured
|
||||||
|
enabled: false
|
||||||
|
# SMTP endpoint
|
||||||
|
host:
|
||||||
|
# SMTP port
|
||||||
|
port:
|
||||||
|
# enable/disable check on TLS certificate
|
||||||
|
insecure_skip_verify:
|
||||||
|
# SMTP username
|
||||||
|
username:
|
||||||
|
# SMTP password
|
||||||
|
password:
|
||||||
|
# email address in from field
|
||||||
|
from:
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
# limits:
|
# limits:
|
||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
|
|
Loading…
Reference in a new issue