feat: add support for customizable annotations for Redis and Sentinel pods (#1588)

Signed-off-by: Bing <[email protected]>

Author: hanbing204

charts/redis-cluster/README.md

@@ -65,6 +65,7 @@ helm delete <my-release> --namespace <namespace>
 | initContainer.imagePullPolicy | string | `"IfNotPresent"` |  |
 | initContainer.resources | object | `{}` |  |
 | labels | object | `{}` |  |
+| podAnnotations | object | `{}` | Pod annotations to be applied to all Redis pods |
 | podSecurityContext.fsGroup | int | `1000` |  |
 | podSecurityContext.runAsUser | int | `1000` |  |
 | priorityClassName | string | `""` |  |

charts/redis-cluster/templates/redis-cluster.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Values.redisCluster.name | default .Release.Name }}
   labels: {{- include "common.labels" . | nindent 4 }}
   annotations:
+    {{- if .Values.podAnnotations }}
+    {{ toYaml .Values.podAnnotations | nindent 4 }}
+    {{- end }}
     {{ if .Values.redisCluster.recreateStatefulSetOnUpdateInvalid }}
     redis.opstreelabs.in/recreate-statefulset: "true"
     {{ end }}

charts/redis-cluster/values.yaml

@@ -214,6 +214,11 @@ podSecurityContext:
   runAsUser: 1000
   fsGroup: 1000
 
+# -- Pod annotations to be applied to all Redis pods
+podAnnotations: {}
+  # annotation-key: "annotation-value"
+  # prometheus.io/scrape: "true"
+  # prometheus.io/port: "6379"
 
 # serviceAccountName: redis-sa
 

charts/redis-replication/README.md

@@ -64,6 +64,7 @@ helm delete <my-release> --namespace <namespace>
 | initContainer.imagePullPolicy | string | `"IfNotPresent"` |  |
 | initContainer.resources | object | `{}` |  |
 | labels | object | `{}` |  |
+| podAnnotations | object | `{}` | Pod annotations to be applied to all Redis pods |
 | nodeSelector | object | `{}` |  |
 | pdb.enabled | bool | `false` |  |
 | pdb.maxUnavailable | string | `nil` |  |

charts/redis-replication/templates/redis-replication.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Values.redisReplication.name | default .Release.Name }}
   labels: {{- include "common.labels" . | nindent 4 }}
   annotations:
+    {{- if .Values.podAnnotations }}
+    {{ toYaml .Values.podAnnotations | nindent 4 }}
+    {{- end }}
     {{ if .Values.redisReplication.recreateStatefulSetOnUpdateInvalid }}
     redis.opstreelabs.in/recreate-statefulset: "true"
     {{ end }}

charts/redis-replication/values.yaml

@@ -151,6 +151,12 @@ tolerations: []
 
 serviceAccountName: ""
 
+# -- Pod annotations to be applied to all Redis pods
+podAnnotations: {}
+  # annotation-key: "annotation-value"
+  # prometheus.io/scrape: "true"
+  # prometheus.io/port: "6379"
+
 TLS:
   ca: ca.key
   cert: tls.crt

charts/redis-sentinel/README.md

@@ -63,6 +63,7 @@ helm delete <my-release> --namespace <namespace>
 | initContainer.imagePullPolicy | string | `"IfNotPresent"` |  |
 | initContainer.resources | object | `{}` |  |
 | labels | object | `{}` |  |
+| podAnnotations | object | `{}` | Pod annotations to be applied to all sentinel pods |
 | livenessProbe.failureThreshold | int | `3` |  |
 | livenessProbe.initialDelaySeconds | int | `1` |  |
 | livenessProbe.periodSeconds | int | `10` |  |

charts/redis-sentinel/templates/redis-sentinel.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Values.redisSentinel.name | default .Release.Name }}
   labels: {{- include "common.labels" . | nindent 4 }}
   annotations:
+    {{- if .Values.podAnnotations }}
+    {{ toYaml .Values.podAnnotations | nindent 4 }}
+    {{- end }}
     {{ if .Values.redisSentinel.recreateStatefulSetOnUpdateInvalid }}
     redis.opstreelabs.in/recreate-statefulset: "true"
     {{ end }}

charts/redis-sentinel/values.yaml

@@ -152,6 +152,12 @@ tolerations: []
 
 serviceAccountName: ""
 
+# -- Pod annotations to be applied to all sentinel pods
+podAnnotations: {}
+  # annotation-key: "annotation-value"
+  # prometheus.io/scrape: "true"
+  # prometheus.io/port: "6379"
+
 TLS:
   ca: ca.key
   cert: tls.crt

charts/redis/README.md

@@ -63,6 +63,7 @@ helm delete <my-release> --namespace <namespace>
 | initContainer.imagePullPolicy | string | `"IfNotPresent"` |  |
 | initContainer.resources | object | `{}` |  |
 | labels | object | `{}` |  |
+| podAnnotations | object | `{}` | Pod annotations to be applied to all Redis pods |
 | nodeSelector | object | `{}` |  |
 | podSecurityContext.fsGroup | int | `1000` |  |
 | podSecurityContext.runAsUser | int | `1000` |  |