From f1f0a7983e73a80d41933be2c1ecb4f5600ceb98 Mon Sep 17 00:00:00 2001 From: jessebot Date: Fri, 15 Dec 2023 09:46:34 +0100 Subject: [PATCH 1/2] add mariadb image.registry fallback to docker.io and update docs for mariadb.image parameters Signed-off-by: jessebot --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 3 +++ charts/nextcloud/templates/deployment.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 756f4a0f..593adc7b 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.5.6 +version: 4.5.7 appVersion: 27.1.4 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md index a530c20f..e1a85bf3 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -231,6 +231,9 @@ If you choose to use one of the prepackaged Bitnami helm charts, you must config | `mariadb.auth.password` | Password for the database | `changeme` | | `mariadb.auth.rootPassword` | MariaDB admin password | `nil` | | `mariadb.auth.existingSecret` | Use existing secret for MariaDB password details; see values.yaml for more detail | `''` | +| `mariadb.image.registry` | MariaDB image registry | `docker.io` | +| `mariadb.image.repository` | MariaDB image repository | `bitnami/mariadb` | +| `mariadb.image.tag` | MariaDB image tag | `15.4.0-debian-11-r10`| | `mariadb.primary.persistence.enabled` | Whether or not to Use a PVC on MariaDB primary | `false` | | `mariadb.primary.persistence.existingClaim` | Use an existing PVC for MariaDB primary | `nil` | | `postgresql.enabled` | Whether to use the PostgreSQL chart | `false` | diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml index c06616e1..084a3018 100644 --- a/charts/nextcloud/templates/deployment.yaml +++ b/charts/nextcloud/templates/deployment.yaml @@ -279,7 +279,7 @@ spec: {{- end }} {{- if .Values.mariadb.enabled }} - name: mariadb-isalive - image: {{ .Values.mariadb.image.registry }}/{{ .Values.mariadb.image.repository }}:{{ .Values.mariadb.image.tag }} + image: {{ .Values.mariadb.image.registry | default "docker.io" }}/{{ .Values.mariadb.image.repository }}:{{ .Values.mariadb.image.tag }} env: - name: MYSQL_USER valueFrom: From 49c5f39122147e42eb942b6b37160d4c69685bb1 Mon Sep 17 00:00:00 2001 From: jessebot Date: Fri, 15 Dec 2023 09:50:28 +0100 Subject: [PATCH 2/2] don't hardcode the mariadb image tag because it would be hard to keep up to date Signed-off-by: jessebot --- charts/nextcloud/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md index e1a85bf3..8fb0e65e 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -233,7 +233,7 @@ If you choose to use one of the prepackaged Bitnami helm charts, you must config | `mariadb.auth.existingSecret` | Use existing secret for MariaDB password details; see values.yaml for more detail | `''` | | `mariadb.image.registry` | MariaDB image registry | `docker.io` | | `mariadb.image.repository` | MariaDB image repository | `bitnami/mariadb` | -| `mariadb.image.tag` | MariaDB image tag | `15.4.0-debian-11-r10`| +| `mariadb.image.tag` | MariaDB image tag | `` | | `mariadb.primary.persistence.enabled` | Whether or not to Use a PVC on MariaDB primary | `false` | | `mariadb.primary.persistence.existingClaim` | Use an existing PVC for MariaDB primary | `nil` | | `postgresql.enabled` | Whether to use the PostgreSQL chart | `false` |