fix(redis): skip creation of master and replica serviceaccount when u…

…sing sentinel Signed-off-by: wilmarguida <[email protected]>
bitnami · Jan 25, 2024 · 4a75994 · 4a75994
1 parent 61cd3c2
commit 4a75994
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
@@ -34,4 +34,4 @@ maintainers:
 name: redis
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/redis
-version: 18.8.1
+version: 18.8.3
diff --git a/bitnami/redis/templates/master/serviceaccount.yaml b/bitnami/redis/templates/master/serviceaccount.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.master.serviceAccount.create }}
+{{- if and .Values.master.serviceAccount.create (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.master.serviceAccount.automountServiceAccountToken }}

diff --git a/bitnami/redis/templates/replicas/serviceaccount.yaml b/bitnami/redis/templates/replicas/serviceaccount.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.replica.serviceAccount.create }}
+{{- if and .Values.replica.serviceAccount.create (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.replica.serviceAccount.automountServiceAccountToken }}

diff --git a/bitnami/redis/templates/serviceaccount.yaml b/bitnami/redis/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.serviceAccount.create (and (not .Values.master.serviceAccount.create) (not .Values.replica.serviceAccount.create)) }}
+{{- if and .Values.serviceAccount.create .Values.sentinel.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}