[charts/redis-ha] Add ability to specify annotations for a ServiceAcc…

…ount (DandyDeveloper#287) Signed-off-by: a-hat <[email protected]>
a-hat · Aug 22, 2024 · 26ca333 · 26ca333
1 parent 37363dc
commit 26ca333
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.27.1
+version: 4.27.2
 appVersion: 7.2.4
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png

diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md
@@ -72,6 +72,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `serviceAccount.create`   | Specifies whether a ServiceAccount should be created                                                                                                                                                     | `true`                                                                                     |
 | `serviceAccount.name`     | The name of the ServiceAccount to create                                                                                                                                                                 | Generated using the redis-ha.fullname template                                             |
 | `serviceAccount.automountToken` | Opt in/out of automounting API credentials into container                                                                                                                                           | `false`                                                                                    |
+| `serviceAccount.annotations`   | Specifies annotations that should be applied to the service account                                                                                                                                                     | `{}`                                                                                     |
 | `serviceAnnotations`                                 | Annotations to set on Redis HA service                                                                                | `null` |
 | `serviceLabels`                                      | Labels to set on Redis HA service                                                                                     | `{}` |
 | `rbac.create`             | Create and use RBAC resources                                                                                                                                                                            | `true`                                                                                     |

diff --git a/charts/redis-ha/templates/redis-ha-serviceaccount.yaml b/charts/redis-ha/templates/redis-ha-serviceaccount.yaml
@@ -12,6 +12,10 @@ metadata:
     {{- range $key, $value := .Values.extraLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+{{- if .Values.serviceAccount.annotations }}
+  annotations:
+{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
+{{- end }}
 {{- if or .Values.auth .Values.sentinel.auth }}
 secrets:
 {{- end }}

diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml
@@ -65,6 +65,8 @@ serviceAccount:
   ## opt in/out of automounting API credentials into container
   ## https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   automountToken: false
+  # Annotations to be added to the service account for the redis statefulset
+  annotations: {}
 
 ## Enables a HA Proxy for better LoadBalancing / Sentinel Master support. Automatically proxies to Redis master.
 ## Recommend for externally exposed Redis clusters.