diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 80c2031fbcf2a9..a14adec593c678 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -36,4 +36,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis -version: 20.5.0 +version: 20.6.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index c8265b61b0ffc7..56154ebf5c6b96 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -635,6 +635,7 @@ helm install my-release --set master.persistence.existingClaim=PVC_NAME oci://RE | `master.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `{}` | | `master.pdb.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `master.pdb.minAvailable` and `master.pdb.maxUnavailable` are empty. | `{}` | | `master.extraPodSpec` | Optionally specify extra PodSpec for the Redis® master pod(s) | `{}` | +| `master.annotations` | Additional custom annotations for Redis® master resource | `{}` | ### Redis® replicas configuration parameters @@ -764,6 +765,7 @@ helm install my-release --set master.persistence.existingClaim=PVC_NAME oci://RE | `replica.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `{}` | | `replica.pdb.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `replica.pdb.minAvailable` and `replica.pdb.maxUnavailable` are empty. | `{}` | | `replica.extraPodSpec` | Optionally specify extra PodSpec for the Redis® replicas pod(s) | `{}` | +| `replica.annotations` | Additional custom annotations for Redis® replicas resource | `{}` | ### Redis® Sentinel configuration parameters diff --git a/bitnami/redis/templates/master/application.yaml b/bitnami/redis/templates/master/application.yaml index 3cb59d6abaa374..7218626e703698 100644 --- a/bitnami/redis/templates/master/application.yaml +++ b/bitnami/redis/templates/master/application.yaml @@ -12,8 +12,9 @@ metadata: namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: master - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- if or .Values.commonAnnotations .Values.master.annotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.master.annotations .Values.commonAnnotations ) "context" . ) }} + annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: {{- if not (eq .Values.master.kind "DaemonSet") }} diff --git a/bitnami/redis/templates/replicas/application.yaml b/bitnami/redis/templates/replicas/application.yaml index 23be4bd96b0fd1..66527e1ea091bb 100644 --- a/bitnami/redis/templates/replicas/application.yaml +++ b/bitnami/redis/templates/replicas/application.yaml @@ -11,8 +11,9 @@ metadata: namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: replica - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- if or .Values.commonAnnotations .Values.replica.annotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.replica.annotations .Values.commonAnnotations ) "context" . ) }} + annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: {{- if and (not (eq .Values.replica.kind "DaemonSet")) (not .Values.replica.autoscaling.enabled) }} diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index 4725f23ce3ab00..f33856130ae1e4 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -640,6 +640,9 @@ master: ## @param master.extraPodSpec Optionally specify extra PodSpec for the Redis® master pod(s) ## extraPodSpec: {} + ## @param master.annotations Additional custom annotations for Redis® Master resource + ## + annotations: {} ## @section Redis® replicas configuration parameters ## replica: @@ -1128,6 +1131,9 @@ replica: ## @param replica.extraPodSpec Optionally specify extra PodSpec for the Redis® replicas pod(s) ## extraPodSpec: {} + ## @param replica.annotations Additional custom annotations for Redis® replicas resource + ## + annotations: {} ## @section Redis® Sentinel configuration parameters ##