[pulsar-helm-chart] branch master updated: Allow to change broker service account annotations (#22)

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
     new 6cddb81  Allow to change broker service account annotations (#22)
6cddb81 is described below

commit 6cddb81da148423b7e671b47cdd78758ee3c9b64
Author: Julien Berard <ju...@gmail.com>
AuthorDate: Tue Jun 23 02:11:28 2020 +0100

    Allow to change broker service account annotations (#22)
    
    ### Motivation
    
    We need to be able to change annotation to inject AWS IAM role (EKS based deployment).
    https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
    
    With 2.6.0 and this annotation change we were able to use Tiered Storage with S3 and EKS/IAM(OIDC).
    
    e.g :
    ```
      annotations:
        eks.amazonaws.com/role-arn: arn:aws:iam::66666:role/my-iam-role-with-s3-access
    ```
    values.yaml
    ```
    broker:
      service_account:
        annotations:
          eks.amazonaws.com/role-arn: arn:aws:iam::66666:role/my-iam-role-with-s3-access
    ```
    ### Modifications
    
    Added a value to allow to change annotations fro broker service account.
    I've tried following style from other part of the code.
    
    ### Verifying this change
    
    - [ ] Make sure that the change passes the CI checks.
---
 charts/pulsar/templates/broker-service-account.yaml | 6 +++++-
 charts/pulsar/values.yaml                           | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/pulsar/templates/broker-service-account.yaml b/charts/pulsar/templates/broker-service-account.yaml
index 257f593..5e77d10 100644
--- a/charts/pulsar/templates/broker-service-account.yaml
+++ b/charts/pulsar/templates/broker-service-account.yaml
@@ -26,4 +26,8 @@ metadata:
   labels:
     {{- include "pulsar.standardLabels" . | nindent 4 }}
     component: {{ .Values.broker.component }}
-{{- end }}
\ No newline at end of file
+  annotations:
+{{- with .Values.broker.service_account.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index b7248b2..4c82736 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -592,6 +592,10 @@ broker:
   pdb:
     usePolicy: true
     maxUnavailable: 1
+  ### Broker service account
+  ## templates/broker-service-account.yaml
+  service_account:
+    annotations: {}
 
 ## Pulsar: Functions Worker
 ## templates/function-worker-configmap.yaml