From a20fb591bd429c3a16818d44338dc94c34dd2143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=B6hl=2C=20Lukas?= Date: Wed, 11 May 2022 12:51:56 +0200 Subject: [PATCH 1/2] fix: possibility to add service account annotations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Höhl, Lukas --- rocketchat/Chart.yaml | 2 +- rocketchat/templates/serviceaccount.yaml | 4 ++++ rocketchat/values.yaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rocketchat/Chart.yaml b/rocketchat/Chart.yaml index e38678e..b294e10 100644 --- a/rocketchat/Chart.yaml +++ b/rocketchat/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: rocketchat -version: 4.7.0 +version: 4.7.1 appVersion: 4.7.0 dependencies: - name: mongodb diff --git a/rocketchat/templates/serviceaccount.yaml b/rocketchat/templates/serviceaccount.yaml index f04493c..698ce11 100644 --- a/rocketchat/templates/serviceaccount.yaml +++ b/rocketchat/templates/serviceaccount.yaml @@ -7,5 +7,9 @@ metadata: helm.sh/chart: {{ include "rocketchat.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} name: {{ template "rocketchat.serviceAccountName" . }} {{- end -}} diff --git a/rocketchat/values.yaml b/rocketchat/values.yaml index 74d166e..2742735 100644 --- a/rocketchat/values.yaml +++ b/rocketchat/values.yaml @@ -140,6 +140,10 @@ securityContext: serviceAccount: # Specifies whether a ServiceAccount should be created create: true + + # Annotations to add to the ServiceAccount + annotations: {} + # eks.amazonaws.com/role-arn: arn:aws:iam::123456789012:role/dummyRole # The name of the ServiceAccount to use. # If not set and create is true, a name is generated using the fullname template From 2a2cdd634149ef5bc7ed8e8b00d8b3df7385a893 Mon Sep 17 00:00:00 2001 From: "Pedro T. R. Pinheiro" Date: Wed, 25 May 2022 22:31:42 -0300 Subject: [PATCH 2/2] Update Chart.yaml Versions bumps are handled in a different way. Also, we're not going to bump it, for now. --- rocketchat/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocketchat/Chart.yaml b/rocketchat/Chart.yaml index b294e10..e38678e 100644 --- a/rocketchat/Chart.yaml +++ b/rocketchat/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: rocketchat -version: 4.7.1 +version: 4.7.0 appVersion: 4.7.0 dependencies: - name: mongodb