Skip to content

Commit 13c6479

Browse files
wilmardoIbone González MaurazaIbone González Mauraza
authoredJan 26, 2024··
[bitnami/redis] Do not create master and replica serviceaccounts when using sentinel (#22716)
* fix(redis): skip creation of master and replica serviceaccount when using sentinel Signed-off-by: wilmarguida <w.denouden@guida.nl> * chore(redis): bump the chart version Co-authored-by: Ibone González Mauraza <ibone.gonzalez-mauraza@broadcom.com> Signed-off-by: Wilmar den Ouden <wilmardo@users.noreply.github.com> --------- Signed-off-by: wilmarguida <w.denouden@guida.nl> Signed-off-by: Wilmar den Ouden <wilmardo@users.noreply.github.com> Signed-off-by: Ibone González Mauraza <gibone@vmware.com> Co-authored-by: Ibone González Mauraza <ibone.gonzalez-mauraza@broadcom.com> Co-authored-by: Ibone González Mauraza <gibone@vmware.com>
1 parent 173a09f commit 13c6479

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed
 

‎bitnami/redis/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ maintainers:
3434
name: redis
3535
sources:
3636
- https://github.com/bitnami/charts/tree/main/bitnami/redis
37-
version: 18.8.2
37+
version: 18.8.3

‎bitnami/redis/templates/master/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
33
SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

6-
{{- if .Values.master.serviceAccount.create }}
6+
{{- if and .Values.master.serviceAccount.create (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
77
apiVersion: v1
88
kind: ServiceAccount
99
automountServiceAccountToken: {{ .Values.master.serviceAccount.automountServiceAccountToken }}

‎bitnami/redis/templates/replicas/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
33
SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

6-
{{- if .Values.replica.serviceAccount.create }}
6+
{{- if and .Values.replica.serviceAccount.create (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
77
apiVersion: v1
88
kind: ServiceAccount
99
automountServiceAccountToken: {{ .Values.replica.serviceAccount.automountServiceAccountToken }}

0 commit comments

Comments
 (0)
Please sign in to comment.