feat(argocd-notifications): Support new notification controller features from argoproj-labs/argocd-notifications#77 (#1066)

* Support setting secret name

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Support setting configmap name

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Use the fullname template for secret name

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Use the fullname template for configmap name

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Bump chart version 1.6.1 -> 1.7.0

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Update changelog

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

* Update README

Signed-off-by: Hendrik Maus <aidentailor@gmail.com>

Co-authored-by: Marko Bevc <marko@scalefactory.com>
This commit is contained in:
Hendrik Maus 2021-12-20 19:17:54 +01:00 committed by GitHub
parent dbcd02fd8d
commit 0ce72e3028
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 4 deletions

View file

@ -113,3 +113,26 @@ Create the name of the bot service account to use
{{ default "default" .Values.bots.slack.serviceAccount.name }}
{{- end -}}
{{- end -}}
{{/*
Create the name of the secret to use
*/}}
{{- define "argocd-notifications.secretName" -}}
{{- if .Values.secret.create -}}
{{ default (printf "%s-secret" (include "argocd-notifications.fullname" .)) .Values.secret.name }}
{{- else -}}
{{ default "argocd-notifications-secret" .Values.secret.name }}
{{- end -}}
{{- end -}}
{{/*
Create the name of the configmap to use
*/}}
{{- define "argocd-notifications.configMapName" -}}
{{- if .Values.cm.create -}}
{{ default (printf "%s-cm" (include "argocd-notifications.fullname" .)) .Values.cm.name }}
{{- else -}}
{{ default "argocd-notifications-cm" .Values.cm.name }}
{{- end -}}
{{- end -}}

View file

@ -2,7 +2,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: argocd-notifications-cm
name: {{ include "argocd-notifications.configMapName" . }}
labels:
{{- include "argocd-notifications.labels" . | nindent 4 }}
data:

View file

@ -45,6 +45,8 @@ spec:
{{- if .Values.metrics.enabled }}
- --metrics-port={{ .Values.metrics.port }}
{{- end }}
- --secret-name={{ include "argocd-notifications.secretName" . }}
- --config-map-name={{ include "argocd-notifications.configMapName" . }}
{{- range .Values.extraArgs }}
- {{ . | squote }}
{{- end }}

View file

@ -2,7 +2,7 @@
apiVersion: v1
kind: Secret
metadata:
name: argocd-notifications-secret
name: {{ include "argocd-notifications.secretName" . }}
labels:
{{- include "argocd-notifications.labels" . | nindent 4 }}
{{- if .Values.secret.annotations }}