From b33ff200f4710173de48581071bc132d09618594 Mon Sep 17 00:00:00 2001 From: Aldemir Akpinar Date: Mon, 9 Sep 2024 12:05:44 +0300 Subject: [PATCH] [bitnami/redis] Support extraEnvVars on volume-permissions for dynamic subfolders (#29195) * Support extraEnvVars on volume-permissions for dynamic subfolders Signed-off-by: Aldemir Akpinar * mofied values.yaml Signed-off-by: Aldemir Akpinar * Added readme and bumped chart version Signed-off-by: Aldemir Akpinar * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Aldemir Akpinar Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/redis/CHANGELOG.md | 8 ++++++-- bitnami/redis/Chart.yaml | 2 +- bitnami/redis/README.md | 1 + bitnami/redis/templates/master/application.yaml | 4 ++++ bitnami/redis/templates/replicas/application.yaml | 4 ++++ bitnami/redis/templates/sentinel/statefulset.yaml | 4 ++++ bitnami/redis/values.yaml | 8 ++++++++ 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/bitnami/redis/CHANGELOG.md b/bitnami/redis/CHANGELOG.md index f3c149bc39..92317966d0 100644 --- a/bitnami/redis/CHANGELOG.md +++ b/bitnami/redis/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 20.0.5 (2024-09-05) +## 20.1.0 (2024-09-05) -* [bitnami/redis] label slave pod using sentinel masterService ([#29121](https://github.com/bitnami/charts/pull/29121)) +* [bitnami/redis] Support extraEnvVars on volume-permissions for dynamic subfolders ([#29195](https://github.com/bitnami/charts/pull/29195)) + +## 20.0.5 (2024-09-05) + +* [bitnami/redis] label slave pod using sentinel masterService (#29121) ([6ae397f](https://github.com/bitnami/charts/commit/6ae397fb40ff4af6a578c54911f96383e30fed96)), closes [#29121](https://github.com/bitnami/charts/issues/29121) ## 20.0.4 (2024-09-04) diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 0f434b4660..c3300fca28 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.0.5 +version: 20.1.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index f92c91e36f..91180e9bda 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -988,6 +988,7 @@ helm install my-release --set master.persistence.existingClaim=PVC_NAME oci://RE | `volumePermissions.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | | `volumePermissions.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` | | `volumePermissions.containerSecurityContext.runAsUser` | Set init container's Security Context runAsUser | `0` | +| `volumePermissions.extraEnvVars` | Array with extra environment variables to add to volume permissions init container. | `[]` | | `kubectl.image.registry` | Kubectl image registry | `REGISTRY_NAME` | | `kubectl.image.repository` | Kubectl image repository | `REPOSITORY_NAME/kubectl` | | `kubectl.image.digest` | Kubectl image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | diff --git a/bitnami/redis/templates/master/application.yaml b/bitnami/redis/templates/master/application.yaml index b17a2401a5..603d030812 100644 --- a/bitnami/redis/templates/master/application.yaml +++ b/bitnami/redis/templates/master/application.yaml @@ -393,6 +393,10 @@ spec: {{- else }} securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} {{- end }} + {{- if .Values.volumePermissions.extraEnvVars }} + env: + {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.extraEnvVars "context" $) | nindent 12 }} + {{- end }} {{- if .Values.volumePermissions.resources }} resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} {{- else if ne .Values.volumePermissions.resourcesPreset "none" }} diff --git a/bitnami/redis/templates/replicas/application.yaml b/bitnami/redis/templates/replicas/application.yaml index fe4f3346c9..c6ed0b1203 100644 --- a/bitnami/redis/templates/replicas/application.yaml +++ b/bitnami/redis/templates/replicas/application.yaml @@ -413,6 +413,10 @@ spec: {{- else }} securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} {{- end }} + {{- if .Values.volumePermissions.extraEnvVars }} + env: + {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.extraEnvVars "context" $) | nindent 12 }} + {{- end }} {{- if .Values.volumePermissions.resources }} resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} {{- else if ne .Values.volumePermissions.resourcesPreset "none" }} diff --git a/bitnami/redis/templates/sentinel/statefulset.yaml b/bitnami/redis/templates/sentinel/statefulset.yaml index a6335c1322..f02cdbe0af 100644 --- a/bitnami/redis/templates/sentinel/statefulset.yaml +++ b/bitnami/redis/templates/sentinel/statefulset.yaml @@ -639,6 +639,10 @@ spec: {{- else }} securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} {{- end }} + {{- if .Values.volumePermissions.extraEnvVars }} + env: + {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.extraEnvVars "context" $) | nindent 12 }} + {{- end }} {{- if .Values.volumePermissions.resources }} resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} {{- else if ne .Values.volumePermissions.resourcesPreset "none" }} diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index c273fc065d..4de85331c1 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -2103,6 +2103,14 @@ volumePermissions: seLinuxOptions: {} runAsUser: 0 + ## @param volumePermissions.extraEnvVars Array with extra environment variables to add to volume permissions init container. + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## Kubectl InitContainer ## used by Sentinel to update the isMaster label on the Redis(TM) pods ##