From 34f84010b558341d30d3cacd0755e317bb6630fa Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Fri, 7 Mar 2025 11:07:24 +0100 Subject: [PATCH 1/8] [bitnami/matomo] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz --- bitnami/matomo/Chart.yaml | 2 +- bitnami/matomo/templates/cronjob.yaml | 25 ++++++++++++++++++ bitnami/matomo/templates/deployment.yaml | 32 ++++++++++++++++++++++++ bitnami/matomo/values.yaml | 4 +++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml index 5728df32d2e79c..aa26af72cbb0af 100644 --- a/bitnami/matomo/Chart.yaml +++ b/bitnami/matomo/Chart.yaml @@ -39,4 +39,4 @@ maintainers: name: matomo sources: - https://github.com/bitnami/charts/tree/main/bitnami/matomo -version: 9.2.4 +version: 9.3.0 diff --git a/bitnami/matomo/templates/cronjob.yaml b/bitnami/matomo/templates/cronjob.yaml index 3abdec95a9a440..a6101e4a2006eb 100644 --- a/bitnami/matomo/templates/cronjob.yaml +++ b/bitnami/matomo/templates/cronjob.yaml @@ -95,17 +95,26 @@ spec: value: {{ include "matomo.databaseName" . | quote }} - name: MATOMO_DATABASE_USER value: {{ include "matomo.databaseUser" . | quote }} + {{- if .Values.usePasswordFiles }} + - name: MATOMO_DATABASE_PASSWORD_FILE + value: {{ printf "/opt/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} + {{- else }} - name: MATOMO_DATABASE_PASSWORD valueFrom: secretKeyRef: name: {{ include "matomo.databaseSecretName" . }} key: {{ include "matomo.databasePasswordKey" . | quote }} + {{- end }} {{- if gt (len .Values.cronjobs.archive.extraEnvVars) 0 }} {{- toYaml .Values.cronjobs.archive.extraEnvVars | nindent 16 }} {{- end }} volumeMounts: - name: matomo-data mountPath: /bitnami/matomo + {{- if .Values.usePasswordFiles }} + - name: matomo-secrets + mountPath: /opt/bitnami/matomo/secrets + {{- end }} {{- if .Values.certificates.customCertificate.certificateSecret }} - name: custom-certificate mountPath: {{ .Values.certificates.customCertificate.certificateLocation }} @@ -274,17 +283,26 @@ spec: value: {{ include "matomo.databaseName" . | quote }} - name: MATOMO_DATABASE_USER value: {{ include "matomo.databaseUser" . | quote }} + {{- if .Values.usePasswordFiles }} + - name: MATOMO_DATABASE_PASSWORD_FILE + value: {{ printf "/opt/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} + {{- else }} - name: MATOMO_DATABASE_PASSWORD valueFrom: secretKeyRef: name: {{ include "matomo.databaseSecretName" . }} key: {{ include "matomo.databasePasswordKey" . | quote }} + {{- end }} {{- if gt (len .Values.cronjobs.taskScheduler.extraEnvVars) 0 }} {{- toYaml .Values.cronjobs.taskScheduler.extraEnvVars | nindent 16 }} {{- end }} volumeMounts: - name: matomo-data mountPath: /bitnami/matomo + {{- if .Values.usePasswordFiles }} + - name: matomo-secrets + mountPath: /opt/bitnami/matomo/secrets + {{- end }} {{- if .Values.certificates.customCertificate.certificateSecret }} - name: custom-certificate mountPath: {{ .Values.certificates.customCertificate.certificateLocation }} @@ -312,6 +330,13 @@ spec: resources: {{- toYaml .Values.cronjobs.taskScheduler.resources | nindent 16 }} {{- end }} volumes: + {{- if .Values.usePasswordFiles }} + - name: matomo-secrets + projected: + sources: + - secret: + name: {{ include "matomo.databaseSecretName" . }} + {{- end }} {{- if .Values.certificates.customCAs }} - name: etc-ssl-certs emptyDir: diff --git a/bitnami/matomo/templates/deployment.yaml b/bitnami/matomo/templates/deployment.yaml index b5acae8d8ea3a0..ff6d33ea4523b5 100644 --- a/bitnami/matomo/templates/deployment.yaml +++ b/bitnami/matomo/templates/deployment.yaml @@ -102,20 +102,30 @@ spec: value: {{ include "matomo.databaseName" . | quote }} - name: MATOMO_DATABASE_USER value: {{ include "matomo.databaseUser" . | quote }} + {{- if .Values.usePasswordFiles }} + - name: MATOMO_DATABASE_PASSWORD_FILE + value: {{ printf "/opt/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} + {{- else }} - name: MATOMO_DATABASE_PASSWORD valueFrom: secretKeyRef: name: {{ include "matomo.databaseSecretName" . }} key: {{ include "matomo.databasePasswordKey" . | quote }} + {{- end }} - name: MATOMO_SKIP_BOOTSTRAP value: {{ ternary "yes" "no" .Values.matomoSkipInstall | quote }} - name: MATOMO_USERNAME value: {{ .Values.matomoUsername | quote }} + {{- if .Values.usePasswordFiles }} + - name: MATOMO_PASSWORD_FILE + value: "/opt/bitnami/matomo/secrets/matomo-password" + {{- else }} - name: MATOMO_PASSWORD valueFrom: secretKeyRef: name: {{ include "matomo.secretName" . }} key: matomo-password + {{- end }} - name: MATOMO_EMAIL value: {{ .Values.matomoEmail | quote }} - name: MATOMO_WEBSITE_NAME @@ -139,12 +149,17 @@ spec: value: {{ .Values.smtpUser | quote }} {{- end }} {{- if or .Values.smtpPassword .Values.smtpExistingSecret }} + {{- if .Values.usePasswordFiles }} + - name: MATOMO_SMTP_PASSWORD_FILE + value: "/opt/bitnami/matomo/secrets/smtp-password" + {{- else }} - name: MATOMO_SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ include "matomo.smtpSecretName" . }} key: smtp-password {{- end }} + {{- end }} {{- if .Values.smtpProtocol }} - name: MATOMO_SMTP_PROTOCOL value: {{ .Values.smtpProtocol | quote }} @@ -226,6 +241,10 @@ spec: volumeMounts: - name: matomo-data mountPath: /bitnami/matomo + {{- if .Values.usePasswordFiles }} + - name: matomo-secrets + mountPath: /opt/bitnami/matomo/secrets + {{- end }} {{- if .Values.certificates.customCertificate.certificateSecret }} - name: custom-certificate mountPath: {{ .Values.certificates.customCertificate.certificateLocation }} @@ -279,6 +298,19 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }} {{- end }} volumes: + {{- if .Values.usePasswordFiles }} + - name: matomo-secrets + projected: + sources: + - secret: + name: {{ include "matomo.databaseSecretName" . }} + - secret: + name: {{ include "matomo.secretName" . }} + {{- if or .Values.smtpPassword .Values.smtpExistingSecret }} + - secret: + name: {{ include "matomo.smtpSecretName" . }} + {{- end }} + {{- end }} {{- if .Values.certificates.customCAs }} - name: etc-ssl-certs emptyDir: diff --git a/bitnami/matomo/values.yaml b/bitnami/matomo/values.yaml index c88aba9f497c37..b40eb5fc458c20 100644 --- a/bitnami/matomo/values.yaml +++ b/bitnami/matomo/values.yaml @@ -57,6 +57,10 @@ commonLabels: {} ## @param extraDeploy Array of extra objects to deploy with the release (evaluated as a template). ## extraDeploy: [] +## @param usePasswordFiles Mount credentials as files instead of using environment variables +## +usePasswordFiles: true + ## @section Matomo parameters ## From 401de23a0b6c7600ae69b1b604f2b99beda32fb3 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 7 Mar 2025 10:10:17 +0000 Subject: [PATCH 2/8] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/matomo/CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md index 4640e93cc19ffc..cf5656bf0e9be4 100644 --- a/bitnami/matomo/CHANGELOG.md +++ b/bitnami/matomo/CHANGELOG.md @@ -1,8 +1,14 @@ # Changelog -## 9.2.4 (2025-02-23) +## 9.3.0 (2025-03-07) -* [bitnami/matomo] Release 9.2.4 ([#32138](https://github.com/bitnami/charts/pull/32138)) +* [bitnami/matomo] Set `usePasswordFiles=true` by default ([#32363](https://github.com/bitnami/charts/pull/32363)) + +## 9.2.4 (2025-02-23) + +* [bitnami/*] Use CDN url for the Bitnami Application Icons (#31881) ([d9bb11a](https://github.com/bitnami/charts/commit/d9bb11a9076b9bfdcc70ea022c25ef50e9713657)), closes [#31881](https://github.com/bitnami/charts/issues/31881) +* [bitnami/matomo] Release 9.2.4 (#32138) ([a276308](https://github.com/bitnami/charts/commit/a2763082856d2e1eb93f4adc9ed26c36b3e13156)), closes [#32138](https://github.com/bitnami/charts/issues/32138) +* Update copyright year (#31682) ([e9f02f5](https://github.com/bitnami/charts/commit/e9f02f5007068751f7eb2270fece811e685c99b6)), closes [#31682](https://github.com/bitnami/charts/issues/31682) ## 9.2.3 (2025-01-24) From 3d6e23d57dc1fc3fedc5505df2b9e9da0ff87694 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 7 Mar 2025 10:10:19 +0000 Subject: [PATCH 3/8] Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --- bitnami/matomo/README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index 6522509188050e..a156532ceef923 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -170,15 +170,16 @@ helm install my-release --set persistence.existingClaim=PVC_NAME oci://REGISTRY_ ### Common parameters -| Name | Description | Value | -| ------------------- | ---------------------------------------------------------------------------------------------------------- | ----- | -| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `""` | -| `nameOverride` | String to partially override matomo.fullname template (will maintain the release name) | `""` | -| `fullnameOverride` | String to fully override matomo.fullname template | `""` | -| `namespaceOverride` | String to fully override common.names.namespace | `""` | -| `commonAnnotations` | Common annotations to add to all Matomo resources (sub-charts are not considered). Evaluated as a template | `{}` | -| `commonLabels` | Common labels to add to all Matomo resources (sub-charts are not considered). Evaluated as a template | `{}` | -| `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template). | `[]` | +| Name | Description | Value | +| ------------------- | ---------------------------------------------------------------------------------------------------------- | ------ | +| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `""` | +| `nameOverride` | String to partially override matomo.fullname template (will maintain the release name) | `""` | +| `fullnameOverride` | String to fully override matomo.fullname template | `""` | +| `namespaceOverride` | String to fully override common.names.namespace | `""` | +| `commonAnnotations` | Common annotations to add to all Matomo resources (sub-charts are not considered). Evaluated as a template | `{}` | +| `commonLabels` | Common labels to add to all Matomo resources (sub-charts are not considered). Evaluated as a template | `{}` | +| `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template). | `[]` | +| `usePasswordFiles` | Mount credentials as files instead of using environment variables | `true` | ### Matomo parameters From 09af2bcf8c13ad589398ad61e129d11abc0de51f Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 13 Mar 2025 09:42:21 +0100 Subject: [PATCH 4/8] Use mountpoint /bitnami/matomo/secrets Signed-off-by: Miguel Ruiz --- bitnami/matomo/templates/deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/matomo/templates/deployment.yaml b/bitnami/matomo/templates/deployment.yaml index ff6d33ea4523b5..a61b024e0beb44 100644 --- a/bitnami/matomo/templates/deployment.yaml +++ b/bitnami/matomo/templates/deployment.yaml @@ -104,7 +104,7 @@ spec: value: {{ include "matomo.databaseUser" . | quote }} {{- if .Values.usePasswordFiles }} - name: MATOMO_DATABASE_PASSWORD_FILE - value: {{ printf "/opt/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} + value: {{ printf "/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} {{- else }} - name: MATOMO_DATABASE_PASSWORD valueFrom: @@ -118,7 +118,7 @@ spec: value: {{ .Values.matomoUsername | quote }} {{- if .Values.usePasswordFiles }} - name: MATOMO_PASSWORD_FILE - value: "/opt/bitnami/matomo/secrets/matomo-password" + value: "/bitnami/matomo/secrets/matomo-password" {{- else }} - name: MATOMO_PASSWORD valueFrom: @@ -151,7 +151,7 @@ spec: {{- if or .Values.smtpPassword .Values.smtpExistingSecret }} {{- if .Values.usePasswordFiles }} - name: MATOMO_SMTP_PASSWORD_FILE - value: "/opt/bitnami/matomo/secrets/smtp-password" + value: "/bitnami/matomo/secrets/smtp-password" {{- else }} - name: MATOMO_SMTP_PASSWORD valueFrom: @@ -243,7 +243,7 @@ spec: mountPath: /bitnami/matomo {{- if .Values.usePasswordFiles }} - name: matomo-secrets - mountPath: /opt/bitnami/matomo/secrets + mountPath: /bitnami/matomo/secrets {{- end }} {{- if .Values.certificates.customCertificate.certificateSecret }} - name: custom-certificate From f0e39360164b65db7e20e3a5b39c57daa0b3d278 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 13 Mar 2025 08:45:47 +0000 Subject: [PATCH 5/8] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/matomo/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md index cf5656bf0e9be4..3eeb48e76f663e 100644 --- a/bitnami/matomo/CHANGELOG.md +++ b/bitnami/matomo/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 9.3.0 (2025-03-07) +## 9.3.0 (2025-03-13) * [bitnami/matomo] Set `usePasswordFiles=true` by default ([#32363](https://github.com/bitnami/charts/pull/32363)) From 1fe03df618f08df8ae31abf0cb6c12ed330b207c Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 13 Mar 2025 10:45:41 +0100 Subject: [PATCH 6/8] Use mountpoint /secrets Signed-off-by: Miguel Ruiz --- bitnami/matomo/templates/deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/matomo/templates/deployment.yaml b/bitnami/matomo/templates/deployment.yaml index a61b024e0beb44..942d46eb9ea8bd 100644 --- a/bitnami/matomo/templates/deployment.yaml +++ b/bitnami/matomo/templates/deployment.yaml @@ -104,7 +104,7 @@ spec: value: {{ include "matomo.databaseUser" . | quote }} {{- if .Values.usePasswordFiles }} - name: MATOMO_DATABASE_PASSWORD_FILE - value: {{ printf "/bitnami/matomo/secrets/%s" (include "matomo.databasePasswordKey" .) }} + value: {{ printf "/secrets/%s" (include "matomo.databasePasswordKey" .) }} {{- else }} - name: MATOMO_DATABASE_PASSWORD valueFrom: @@ -118,7 +118,7 @@ spec: value: {{ .Values.matomoUsername | quote }} {{- if .Values.usePasswordFiles }} - name: MATOMO_PASSWORD_FILE - value: "/bitnami/matomo/secrets/matomo-password" + value: "/secrets/matomo-password" {{- else }} - name: MATOMO_PASSWORD valueFrom: @@ -151,7 +151,7 @@ spec: {{- if or .Values.smtpPassword .Values.smtpExistingSecret }} {{- if .Values.usePasswordFiles }} - name: MATOMO_SMTP_PASSWORD_FILE - value: "/bitnami/matomo/secrets/smtp-password" + value: "/secrets/smtp-password" {{- else }} - name: MATOMO_SMTP_PASSWORD valueFrom: @@ -243,7 +243,7 @@ spec: mountPath: /bitnami/matomo {{- if .Values.usePasswordFiles }} - name: matomo-secrets - mountPath: /bitnami/matomo/secrets + mountPath: /secrets {{- end }} {{- if .Values.certificates.customCertificate.certificateSecret }} - name: custom-certificate From 4311ea069f9ce047c76e0b53151ceaaba9c772c3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 21 Mar 2025 11:12:00 +0000 Subject: [PATCH 7/8] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/matomo/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md index 5c82c08376ec37..5cff0f5814db97 100644 --- a/bitnami/matomo/CHANGELOG.md +++ b/bitnami/matomo/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 9.2.6 (2025-03-18) +## 9.3.0 (2025-03-21) -* [bitnami/matomo] Release 9.2.6 ([#32503](https://github.com/bitnami/charts/pull/32503)) +* [bitnami/matomo] Set `usePasswordFiles=true` by default ([#32363](https://github.com/bitnami/charts/pull/32363)) + +## 9.2.6 (2025-03-18) + +* [bitnami/matomo] Release 9.2.6 (#32503) ([1d91b5e](https://github.com/bitnami/charts/commit/1d91b5ec19f2299c60784bc35827cb4c2e2e072e)), closes [#32503](https://github.com/bitnami/charts/issues/32503) ## 9.2.5 (2025-03-14) From cf57383d5ef1d1f8b0c28bb2b794adc2d7ed3018 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 27 Mar 2025 12:21:34 +0000 Subject: [PATCH 8/8] Update CHANGELOG.md Signed-off-by: Bitnami Bot --- bitnami/matomo/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md index 5cff0f5814db97..0b74e4ef32e5d7 100644 --- a/bitnami/matomo/CHANGELOG.md +++ b/bitnami/matomo/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog -## 9.3.0 (2025-03-21) +## 9.3.0 (2025-03-27) * [bitnami/matomo] Set `usePasswordFiles=true` by default ([#32363](https://github.com/bitnami/charts/pull/32363)) +## 9.2.7 (2025-03-24) + +* [bitnami/matomo] Fix typo in SMTP authentication value for CRAM-MD5 (#32354) ([3e8ed41](https://github.com/bitnami/charts/commit/3e8ed41b493b1c92d2dea76d09e5e63c39a006e3)), closes [#32354](https://github.com/bitnami/charts/issues/32354) + ## 9.2.6 (2025-03-18) * [bitnami/matomo] Release 9.2.6 (#32503) ([1d91b5e](https://github.com/bitnami/charts/commit/1d91b5ec19f2299c60784bc35827cb4c2e2e072e)), closes [#32503](https://github.com/bitnami/charts/issues/32503)