From bf6261613be88786063fa56a475bbf6c99a74b6d Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Fri, 7 Mar 2025 10:59:50 +0100 Subject: [PATCH 1/4] [bitnami/memcached] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz --- bitnami/memcached/Chart.yaml | 2 +- bitnami/memcached/templates/deployment.yaml | 16 ++++++++++++++++ bitnami/memcached/templates/statefulset.yaml | 16 ++++++++++++++++ bitnami/memcached/values.yaml | 3 +++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index a7f10df31e4f84..a2a2d1b2ce3cec 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -31,4 +31,4 @@ maintainers: name: memcached sources: - https://github.com/bitnami/charts/tree/main/bitnami/memcached -version: 7.6.5 +version: 7.7.0 diff --git a/bitnami/memcached/templates/deployment.yaml b/bitnami/memcached/templates/deployment.yaml index 8bea8a46f2d2b8..46afe733e2e61e 100644 --- a/bitnami/memcached/templates/deployment.yaml +++ b/bitnami/memcached/templates/deployment.yaml @@ -99,12 +99,17 @@ spec: {{- if .Values.auth.enabled }} - name: MEMCACHED_USERNAME value: {{ .Values.auth.username | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MEMCACHED_PASSWORD_FILE + value: "/opt/bitnami/memcached/secrets/memcached-password" + {{- else }} - name: MEMCACHED_PASSWORD valueFrom: secretKeyRef: name: {{ template "memcached.secretPasswordName" . }} key: memcached-password {{- end }} + {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} @@ -162,6 +167,10 @@ spec: - name: empty-dir mountPath: /tmp subPath: tmp-dir + {{- if and .Values.auth.enabled .Values.auth.usePasswordFiles }} + - name: memcached-secrets + mountPath: /opt/bitnami/memcached/secrets + {{- end }} {{- if .Values.extraVolumeMounts }} {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 12 }} {{- end }} @@ -222,6 +231,13 @@ spec: {{- else }} emptyDir: {} {{- end }} + {{- if and .Values.auth.enabled .Values.auth.usePasswordFiles }} + - name: memcached-secrets + projected: + sources: + - secret: + name: {{ include "memcached.secretPasswordName" . }} + {{- end }} {{- if .Values.extraVolumes }} {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/memcached/templates/statefulset.yaml b/bitnami/memcached/templates/statefulset.yaml index 94fc205e198798..2677f274a85eb4 100644 --- a/bitnami/memcached/templates/statefulset.yaml +++ b/bitnami/memcached/templates/statefulset.yaml @@ -138,12 +138,17 @@ spec: {{- if .Values.auth.enabled }} - name: MEMCACHED_USERNAME value: {{ .Values.auth.username | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MEMCACHED_PASSWORD_FILE + value: "/opt/bitnami/memcached/secrets/memcached-password" + {{- else }} - name: MEMCACHED_PASSWORD valueFrom: secretKeyRef: name: {{ template "memcached.secretPasswordName" . }} key: memcached-password {{- end }} + {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }} {{- end }} @@ -215,6 +220,10 @@ spec: - name: empty-dir mountPath: /tmp subPath: tmp-dir + {{- if and .Values.auth.enabled .Values.auth.usePasswordFiles }} + - name: memcached-secrets + mountPath: /opt/bitnami/memcached/secrets + {{- end }} {{- if .Values.extraVolumeMounts }} {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 12 }} {{- end }} @@ -269,6 +278,13 @@ spec: {{- else }} emptyDir: {} {{- end }} + {{- if and .Values.auth.enabled .Values.auth.usePasswordFiles }} + - name: memcached-secrets + projected: + sources: + - secret: + name: {{ include "memcached.secretPasswordName" . }} + {{- end }} {{- if .Values.extraVolumes }} {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/memcached/values.yaml b/bitnami/memcached/values.yaml index 1b46401e7c00f6..d7faf249a094a7 100644 --- a/bitnami/memcached/values.yaml +++ b/bitnami/memcached/values.yaml @@ -122,6 +122,9 @@ auth: ## @param auth.existingPasswordSecret Existing secret with Memcached credentials (must contain a value for `memcached-password` key) ## existingPasswordSecret: "" + ## @param auth.usePasswordFiles Mount credentials as files instead of using environment variables + ## + usePasswordFiles: true ## @param command Override default container command (useful when using custom images) ## command: [] From f3687e39578fd38e832b85596de18f1be5fe1df8 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 7 Mar 2025 10:04:12 +0000 Subject: [PATCH 2/4] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/memcached/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/memcached/CHANGELOG.md b/bitnami/memcached/CHANGELOG.md index f9409acc1e51c8..296cbfafca1311 100644 --- a/bitnami/memcached/CHANGELOG.md +++ b/bitnami/memcached/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 7.6.5 (2025-02-20) +## 7.7.0 (2025-03-07) -* [bitnami/memcached] Release 7.6.5 ([#32095](https://github.com/bitnami/charts/pull/32095)) +* [bitnami/memcached] Set `usePasswordFiles=true` by default ([#32362](https://github.com/bitnami/charts/pull/32362)) + +## 7.6.5 (2025-02-20) + +* [bitnami/memcached] Release 7.6.5 (#32095) ([e720816](https://github.com/bitnami/charts/commit/e7208161c5d9284d15baf184dc846dd32ed0db8b)), closes [#32095](https://github.com/bitnami/charts/issues/32095) ## 7.6.4 (2025-02-19) From d0fd6b63d7b90b27348e748aa641d4e1ea5aa1a8 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 7 Mar 2025 10:04:14 +0000 Subject: [PATCH 3/4] Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --- bitnami/memcached/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md index d1f484b070702d..90322fe6d14fd0 100644 --- a/bitnami/memcached/README.md +++ b/bitnami/memcached/README.md @@ -183,6 +183,7 @@ If you encounter errors when working with persistent volumes, refer to our [trou | `auth.username` | Memcached admin user | `""` | | `auth.password` | Memcached admin password | `""` | | `auth.existingPasswordSecret` | Existing secret with Memcached credentials (must contain a value for `memcached-password` key) | `""` | +| `auth.usePasswordFiles` | Mount credentials as files instead of using environment variables | `true` | | `command` | Override default container command (useful when using custom images) | `[]` | | `args` | Override default container args (useful when using custom images) | `[]` | | `extraEnvVars` | Array with extra environment variables to add to Memcached nodes | `[]` | From a19f3348229764dd55cd788147b2961c18728392 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 21 Mar 2025 11:12:57 +0000 Subject: [PATCH 4/4] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/memcached/CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bitnami/memcached/CHANGELOG.md b/bitnami/memcached/CHANGELOG.md index 61c32bac058892..13c21bc68a47a7 100644 --- a/bitnami/memcached/CHANGELOG.md +++ b/bitnami/memcached/CHANGELOG.md @@ -1,8 +1,13 @@ # Changelog -## 7.7.1 (2025-03-19) +## 7.8.0 (2025-03-21) -* [bitnami/memcached] Release 7.7.1 ([#32526](https://github.com/bitnami/charts/pull/32526)) +* [bitnami/memcached] Set `usePasswordFiles=true` by default ([#32362](https://github.com/bitnami/charts/pull/32362)) + +## 7.7.1 (2025-03-19) + +* [bitnami/*] Add tanzuCategory annotation (#32409) ([a8fba5c](https://github.com/bitnami/charts/commit/a8fba5cb01f6f4464ca7f69c50b0fbe97d837a95)), closes [#32409](https://github.com/bitnami/charts/issues/32409) +* [bitnami/memcached] Release 7.7.1 (#32526) ([8d5d1bf](https://github.com/bitnami/charts/commit/8d5d1bfdb67a25630b430d06dc0e1caca6f9f043)), closes [#32526](https://github.com/bitnami/charts/issues/32526) ## 7.7.0 (2025-03-12)