Merge pull request #170 from mrueg/bump-deps

Update dependencies for postgresql, mariadb, and redis
nextcloud · Dec 9, 2021 · f11507f · f11507f
2 parents 8a28dcb + 44e0ca5
commit f11507f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/charts/nextcloud/Chart.lock b/charts/nextcloud/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.13.8
+  version: 10.13.11
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 9.6.5
+  version: 9.8.1
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 13.0.1
-digest: sha256:58eca16807189c98f29b0fe8f7b9df1b4f19ac635e7b81be0f0d3a0a449b2691
-generated: "2021-11-17T15:57:03.491610762+01:00"
+  version: 15.6.3
+digest: sha256:e0f2669aa4200ded2847c3ae83325486678236ed05f55401ae3e72ee6aadf82b
+generated: "2021-12-07T16:14:38.595361734+01:00"
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 2.10.2
+version: 2.11.0
 appVersion: 22.2.3
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
@@ -27,10 +27,10 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   condition: postgresql.enabled
 - name: mariadb
-  version: 9.6.*
+  version: 9.8.*
   repository: https://charts.bitnami.com/bitnami
   condition: mariadb.enabled
 - name: redis
-  version: 13.0.*
+  version: 15.6.*
   repository: https://charts.bitnami.com/bitnami
   condition: redis.enabled
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -124,8 +124,8 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `mariadb.auth.username`                                      | Database user to create                                 | `nextcloud`                                 |
 | `mariadb.auth.rootPassword`                                  | MariaDB admin password                                  | `nil`                                       |
 | `redis.enabled`                                              | Whether to install/use redis for locking                | `false`                                     |
-| `redis.usePassword`                                          | Whether to use a password with redis                    | `false`                                     |
-| `redis.password`                                             | The password redis uses                                 | `''`                                        |
+| `redis.auth.enabled`                                         | Whether to enable password authentication with redis    | `true`                                      |
+| `redis.auth.password`                                        | The password redis uses                                 | `''`                                        |
 | `cronjob.enabled`                                            | Whether to enable/disable cronjob                       | `false`                                     |
 | `cronjob.schedule`                                           | Schedule for the CronJob                                | `*/15 * * * *`                              |
 | `cronjob.annotations`                                        | Annotations to add to the cronjob                       | {}                                          |

diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
@@ -164,16 +164,16 @@ spec:
         - name: REDIS_HOST
           value: {{ template "nextcloud.redis.fullname" . }}-master
         - name: REDIS_HOST_PORT
-          value: {{ .Values.redis.redisPort | quote }}
-        {{- if and .Values.redis.existingSecret .Values.redis.existingSecretPasswordKey }}
+          value: {{ .Values.redis.master.service.port | quote }}
+        {{- if and .Values.redis.auth.existingSecret .Values.redis.auth.existingSecretPasswordKey }}
         - name: REDIS_HOST_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.redis.existingSecret }}
-              key: {{ .Values.redis.existingSecretPasswordKey }}
+              name: {{ .Values.redis.auth.existingSecret }}
+              key: {{ .Values.redis.auth.existingSecretPasswordKey }}
         {{- else }}
         - name: REDIS_HOST_PASSWORD
-          value: {{ .Values.redis.password }}
+          value: {{ .Values.redis.auth.password }}
         {{- end }}
         {{- end }}
         {{- if .Values.nextcloud.extraEnv }}

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -262,10 +262,16 @@ postgresql:
     enabled: false
     # storageClass: ""
 
+##
+## Redis chart configuration
+## for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis
+##
+
 redis:
   enabled: false
-  usePassword: true
-  password: 'changeme'
+  auth:
+    enabled: true
+    password: 'changeme'
 
 ## Cronjob to execute Nextcloud background tasks
 ## ref: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#webcron