From e2975df4c0d27d738ea543a97aec480b026ef86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Yuji=20Okuti?= <cesar.okuti@gmail.com>
Date: Wed, 26 May 2021 18:41:33 -0300
Subject: [PATCH] feat(argocd-notifications): add service account annotations
 (#673)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add service account to argocd notifications

Signed-off-by: Cesar Okuti <cesar.okuti@gmail.com>

* change chart.yaml

Signed-off-by: Cesar Okuti <cesar.okuti@gmail.com>

* remove dots and quotes from toYaml serviceaccount

Signed-off-by: Cesar Okuti <cesar.okuti@gmail.com>

* chore: Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>

* fix: bump chart version

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argocd-notifications/Chart.yaml                        | 2 +-
 .../templates/bots/slack/serviceaccount.yaml                  | 4 ++++
 charts/argocd-notifications/templates/serviceaccount.yaml     | 4 ++++
 charts/argocd-notifications/values.yaml                       | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml
index 714b0474..9be1b26b 100644
--- a/charts/argocd-notifications/Chart.yaml
+++ b/charts/argocd-notifications/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.3.1
+version: 1.3.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml b/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
index badee60f..f888811c 100644
--- a/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
+++ b/charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml
@@ -5,4 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
+  {{- with .Values.bots.slack.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{ end }}
 {{ end }}
diff --git a/charts/argocd-notifications/templates/serviceaccount.yaml b/charts/argocd-notifications/templates/serviceaccount.yaml
index 591d13bd..418b6800 100644
--- a/charts/argocd-notifications/templates/serviceaccount.yaml
+++ b/charts/argocd-notifications/templates/serviceaccount.yaml
@@ -5,4 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml
index bfe746c3..f258401f 100644
--- a/charts/argocd-notifications/values.yaml
+++ b/charts/argocd-notifications/values.yaml
@@ -93,6 +93,8 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: argocd-notifications-controller
 
+  annotations: {}
+
 cm:
   # Whether helm chart creates controller config map
   create: true
@@ -371,6 +373,8 @@ bots:
       # If not set and create is true, a name is generated using the fullname template
       name: argocd-notifications-bot
 
+      annotations: {}
+
     resources: {}
     # limits:
     #   cpu: 100m