Skip to content

[bitnami/redis] Allow grabbing sentinel acl configuration from userSecret #33546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+14 −7
Open

[bitnami/redis] Allow grabbing sentinel acl configuration from userSecret #33546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75da5bb
[bitnami/redis] Allow grabbing sentinel acl configuration from userSe…
jemand771 May 7, 2025
f270c1a
Update CHANGELOG.md
bitnami-bot May 7, 2025
3d85334
Update CHANGELOG.md
bitnami-bot May 8, 2025
8526f07
Apply suggestions from code review
jemand771 May 8, 2025
5a11880
Update bitnami/redis/templates/configmap.yaml
jemand771 May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bitnami/redis/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 21.0.2 (2025-05-07)
## 21.1.0 (2025-05-08)

* [bitnami/redis] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33428](https://github.com/bitnami/charts/pull/33428))
* [bitnami/redis] Allow grabbing sentinel acl configuration from userSecret ([#33546](https://github.com/bitnami/charts/pull/33546))

## <small>21.0.2 (2025-05-07)</small>

* [bitnami/redis] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references (#33428) ([98dff1d](https://github.com/bitnami/charts/commit/98dff1d7e991004d0374b386ea0917edac05316c)), closes [#33428](https://github.com/bitnami/charts/issues/33428)

## <small>21.0.1 (2025-05-07)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/redis/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ maintainers:
name: redis
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/redis
version: 21.0.2
version: 21.1.0
11 changes: 7 additions & 4 deletions bitnami/redis/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,15 @@ data:
sentinel client-reconfig-script {{ .Values.sentinel.masterSet }} /opt/bitnami/scripts/start-scripts/push-master-label.sh
{{- end }}
{{- if .Values.auth.acl.sentinel }}
{{- range .Values.auth.acl.users }}
{{- $userSecret := .Values.auth.acl.userSecret -}}
# Sentinel ACL configuration, only for users with password
{{ if .password }}
user {{ .username }} {{ default "on" .enabled }} {{ if .password }}#{{ sha256sum .password }}{{ else }}nopass{{ end }} ~* &* +@all
{{- range .Values.auth.acl.users }}
{{- $userPassword := .password | default "" }}
{{- $secretPassword := ternary "" (include "common.secrets.get" (dict "secret" $userSecret "key" .username "context" $)) (empty $userSecret) }}
{{ if or $userPassword $secretPassword }}
user {{ .username }} {{ default "on" .enabled }} #{{ coalesce $secretPassword $userPassword | sha256sum }} ~* &* +@all
sentinel sentinel-user {{ .username }}
sentinel sentinel-pass {{ .password }}
sentinel sentinel-pass {{ coalesce $secretPassword $userPassword }}
{{- end }}
{{- end }}
{{- end }}
Expand Down
Loading