Skip to content

Commit 80e00a6

Browse files
osouzaeliasyaron2
andauthored
feat(helm): allow custom annotations on service account for EKS IRSA (dapr#8615)
Signed-off-by: Elias Souza <[email protected]> Co-authored-by: Yaron Schneider <[email protected]>
1 parent b365574 commit 80e00a6

File tree

6 files changed

+31
-0
lines changed

6 files changed

+31
-0
lines changed

charts/dapr/charts/dapr_rbac/templates/injector.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ kind: ServiceAccount
33
metadata:
44
name: dapr-injector
55
namespace: {{ .Release.Namespace }}
6+
{{- with .Values.serviceAccount.injector.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
610
labels:
711
{{- range $key, $value := .Values.global.k8sLabels }}
812
{{ $key }}: {{ tpl $value $ }}

charts/dapr/charts/dapr_rbac/templates/operator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ kind: ServiceAccount
33
metadata:
44
name: dapr-operator
55
namespace: {{ .Release.Namespace }}
6+
{{- with .Values.serviceAccount.operator.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
610
labels:
711
{{- range $key, $value := .Values.global.k8sLabels }}
812
{{ $key }}: {{ tpl $value $ }}

charts/dapr/charts/dapr_rbac/templates/placement.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: ServiceAccount
44
metadata:
55
name: dapr-placement
66
namespace: {{ .Release.Namespace }}
7+
{{- with .Values.serviceAccount.placement.annotations }}
8+
annotations:
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
711
labels:
812
{{- range $key, $value := .Values.global.k8sLabels }}
913
{{ $key }}: {{ tpl $value $ }}

charts/dapr/charts/dapr_rbac/templates/scheduler.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: ServiceAccount
44
metadata:
55
name: dapr-scheduler
66
namespace: {{ .Release.Namespace }}
7+
{{- with .Values.serviceAccount.scheduler.annotations }}
8+
annotations:
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
711
labels:
812
{{- range $key, $value := .Values.global.k8sLabels }}
913
{{ $key }}: {{ tpl $value $ }}

charts/dapr/charts/dapr_rbac/templates/sentry.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ kind: ServiceAccount
33
metadata:
44
name: dapr-sentry
55
namespace: {{ .Release.Namespace }}
6+
{{- with .Values.serviceAccount.sentry.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
610
labels:
711
{{- range $key, $value := .Values.global.k8sLabels }}
812
{{ $key }}: {{ tpl $value $ }}

charts/dapr/charts/dapr_rbac/values.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,14 @@ secretReader:
22
enabled: true
33
namespace: default
44
component: rbac
5+
serviceAccount:
6+
injector:
7+
annotations: {}
8+
operator:
9+
annotations: {}
10+
placement:
11+
annotations: {}
12+
scheduler:
13+
annotations: {}
14+
sentry:
15+
annotations: {}

0 commit comments

Comments
 (0)