From 2d8e19f100c67838636a394c751f6f3994e62f73 Mon Sep 17 00:00:00 2001
From: Fran Mulero <fmulero@vmware.com>
Date: Thu, 13 Jun 2024 16:34:50 +0200
Subject: [PATCH] [bitnami/redis] Fix sentinel PDB condition (#27080)

---
 bitnami/redis/CHANGELOG.md                |  8 ++++++--
 bitnami/redis/Chart.yaml                  |  2 +-
 bitnami/redis/templates/master/pdb.yaml   | 12 ++++++------
 bitnami/redis/templates/replicas/pdb.yaml |  2 +-
 bitnami/redis/templates/sentinel/pdb.yaml | 12 ++++++------
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/bitnami/redis/CHANGELOG.md b/bitnami/redis/CHANGELOG.md
index 332bd6c3e5..39c70cb040 100644
--- a/bitnami/redis/CHANGELOG.md
+++ b/bitnami/redis/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 19.5.2 (2024-06-06)
+## 19.5.3 (2024-06-12)
 
-* [bitnami/redis] Release 19.5.2 ([#27012](https://github.com/bitnami/charts/pull/27012))
+* [bitnami/redis] Fix sentinel PDB condition ([#27080](https://github.com/bitnami/charts/pull/27080))
+
+## <small>19.5.2 (2024-06-06)</small>
+
+* [bitnami/redis] Release 19.5.2 (#27012) ([128a592](https://github.com/bitnami/charts/commit/128a59210d13d4619c9c80aa0631897f0d981917)), closes [#27012](https://github.com/bitnami/charts/issues/27012)
 
 ## <small>19.5.1 (2024-06-04)</small>
 
diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index bdad31a889..72c193d721 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: 19.5.2
+version: 19.5.3
diff --git a/bitnami/redis/templates/master/pdb.yaml b/bitnami/redis/templates/master/pdb.yaml
index 3dd868e9cb..dab636db36 100644
--- a/bitnami/redis/templates/master/pdb.yaml
+++ b/bitnami/redis/templates/master/pdb.yaml
@@ -2,8 +2,8 @@
 Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
-
-{{- if and .Values.master.pdb.create (gt (int64 .Values.master.count) 0) (or (eq .Values.architecture "replication") (not .Values.sentinel.enabled)) }}
+{{- $pdb := coalesce .Values.pdb .Values.master.pdb }}
+{{- if and $pdb.create (gt (int64 .Values.master.count) 0) (or (not (eq .Values.architecture "replication")) (not .Values.sentinel.enabled)) }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
@@ -15,11 +15,11 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.master.pdb.minAvailable }}
-  minAvailable: {{ .Values.master.pdb.minAvailable }}
+  {{- if $pdb.minAvailable }}
+  minAvailable: {{ $pdb.minAvailable }}
   {{- end }}
-  {{- if or .Values.master.pdb.maxUnavailable (not .Values.master.pdb.minAvailable)}}
-  maxUnavailable: {{ .Values.master.pdb.maxUnavailable | default 1 }}
+  {{- if or $pdb.maxUnavailable (not $pdb.minAvailable)}}
+  maxUnavailable: {{ $pdb.maxUnavailable | default 1 }}
   {{- end }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
diff --git a/bitnami/redis/templates/replicas/pdb.yaml b/bitnami/redis/templates/replicas/pdb.yaml
index 59e4e39f9e..d7b777b5ca 100644
--- a/bitnami/redis/templates/replicas/pdb.yaml
+++ b/bitnami/redis/templates/replicas/pdb.yaml
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- $pdb := coalesce .Values.replica.pdb .Values.pdb }}
+{{- $pdb := coalesce .Values.pdb .Values.replica.pdb }}
 {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) $pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
diff --git a/bitnami/redis/templates/sentinel/pdb.yaml b/bitnami/redis/templates/sentinel/pdb.yaml
index 3ee99b94e8..32ddad654b 100644
--- a/bitnami/redis/templates/sentinel/pdb.yaml
+++ b/bitnami/redis/templates/sentinel/pdb.yaml
@@ -2,8 +2,8 @@
 Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
-
-{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) .Values.replica.pdb.create }}
+{{- $pdb := coalesce .Values.pdb .Values.replica.pdb }}
+{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled $pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
@@ -15,11 +15,11 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.replica.pdb.minAvailable }}
-  minAvailable: {{ .Values.replica.pdb.minAvailable }}
+  {{- if $pdb.minAvailable }}
+  minAvailable: {{ $pdb.minAvailable }}
   {{- end }}
-  {{- if or .Values.replica.pdb.maxUnavailable (not .Values.replica.pdb.minAvailable) }}
-  maxUnavailable: {{ .Values.replica.pdb.maxUnavailable | default 1 }}
+  {{- if or $pdb.maxUnavailable (not $pdb.minAvailable) }}
+  maxUnavailable: {{ $pdb.maxUnavailable | default 1 }}
   {{- end }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}