[6.8] [logstash] add rbac custom annotations (elastic#764) (elastic#944)

Co-authored-by: Michael Borens <appo.esl@gmail.com>
jmlrt · Nov 26, 2020 · f93bb01 · f93bb01
1 parent f15a6be
commit f93bb01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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
@@ -89,6 +89,10 @@ rbac:
   create: false
   serviceAccountAnnotations: {}
   serviceAccountName: ""
+  annotations: {}
+    #annotation1: "value1"
+    #annotation2: "value2"
+    #annotation3: "value3"
 
 podSecurityPolicy:
   create: false