[chart/redis-ha] ha-proxy: opt out of service account mounting #291

Signed-off-by: a-hat <github@andreaskappler.de>
DandyDeveloper · Aug 22, 2024 · fcf1f23 · fcf1f23
1 parent 408c54c
commit fcf1f23
Show file tree

Hide file tree

Showing 4 changed files with 5 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.2
+version: 4.28.0
 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
@@ -185,6 +185,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `haproxy.emptyDir`        | Configuration of `emptyDir`                                                                                                                                  | `{}`                                                                                       |
 | `haproxy.labels`          | Labels for the HAProxy pod                                                                                                                                  | `{}`                                                                                       |
 | `haproxy.serviceAccountName`| HAProxy serviceAccountName                                                                                                                                                                                 | `default`
+| `haproxy.serviceAccount.automountToken` | Opt in/out of automounting API credentials into container                                                                                                                                           | `false`                                                                                    |
 | `haproxy.service.type`                 | HAProxy service type "ClusterIP", "LoadBalancer" or "NodePort"                                                                                                                              | `ClusterIP`                                                                                |
 | `haproxy.service.nodePort`             | HAProxy service nodePort value (haproxy.service.type must be NodePort)                                                                                                                      | not set                                                                                    |
 | `haproxy.image.serviceAccountName`| HAProxy serviceAccountName                                                                                                                                                                                 | `default`

diff --git a/charts/redis-ha/templates/redis-haproxy-deployment.yaml b/charts/redis-ha/templates/redis-haproxy-deployment.yaml
@@ -49,6 +49,7 @@ spec:
       {{- else }}
       serviceAccountName: {{ .Values.haproxy.serviceAccountName }}
       {{- end }}
+      automountServiceAccountToken: {{ .Values.haproxy.serviceAccount.automountToken }}
       securityContext: {{ toYaml .Values.haproxy.securityContext | nindent 8 }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}

diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml
@@ -138,6 +138,8 @@ haproxy:
   serviceAccountName: redis-sa
   serviceAccount:
     create: true
+    automountServiceAccountToken: false
+
   ## Official HAProxy embedded prometheus metrics settings.
   ## Ref: https://github.com/haproxy/haproxy/tree/master/contrib/prometheus-exporter
   ##