From f93bb01220b3cdbbe11c5368ac611c82dc8cbd07 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Thu, 26 Nov 2020 10:20:05 +0100
Subject: [PATCH] [6.8] [logstash] add rbac custom annotations (#764) (#944)

Co-authored-by: Michael Borens <appo.esl@gmail.com>
---
 logstash/templates/serviceaccount.yaml | 6 ++++++
 logstash/tests/logstash_test.py        | 2 ++
 logstash/values.yaml                   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/logstash/templates/serviceaccount.yaml b/logstash/templates/serviceaccount.yaml
index 4508878b8..bb72735b6 100644
--- a/logstash/templates/serviceaccount.yaml
+++ b/logstash/templates/serviceaccount.yaml
@@ -17,4 +17,10 @@ metadata:
     chart: "{{ .Chart.Name }}"
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
+  {{- if .Values.rbac.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.rbac.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 {{- end -}}
diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
index caee32c29..1555b960c 100755
--- a/logstash/tests/logstash_test.py
+++ b/logstash/tests/logstash_test.py
@@ -760,6 +760,8 @@ def test_pod_security_policy():
 rbac:
   create: true
   serviceAccountName: ""
+  annotations:
+    "eks.amazonaws.com/role-arn": "test-rbac-annotations"
 
 podSecurityPolicy:
   create: true
diff --git a/logstash/values.yaml b/logstash/values.yaml
index d5166588b..54e6fe4cb 100755
--- a/logstash/values.yaml
+++ b/logstash/values.yaml
@@ -89,6 +89,10 @@ rbac:
   create: false
   serviceAccountAnnotations: {}
   serviceAccountName: ""
+  annotations: {}
+    #annotation1: "value1"
+    #annotation2: "value2"
+    #annotation3: "value3"
 
 podSecurityPolicy:
   create: false