Merge branch 'main' into upgrade-avoid-probes

nextcloud · Jul 22, 2024 · 7043ee9 · 7043ee9
2 parents 2051df4 + ddf49e9
commit 7043ee9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 5.2.0
+version: 5.2.2
 appVersion: 29.0.3
 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
@@ -154,13 +154,17 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `redis.auth.password`                                      | The password redis uses                                                                             | `''`                       |
 | `redis.auth.existingSecret`                                | The name of an existing secret with Redis® credentials                                              | `''`                       |
 | `redis.auth.existingSecretPasswordKey`                     | Password key to be retrieved from existing secret                                                   | `''`                       |
+| `redis.global.storageClass`                                | PVC Storage Class  for both Redis&reg; master and replica Persistent Volumes                        | `''`                       |
+| `redis.master.persistence.enabled`                         | Enable persistence on Redis&reg; master nodes using Persistent Volume Claims                        | `true`                     |
+| `redis.replica.persistence.enabled`                        | Enable persistence on Redis&reg; replica nodes using Persistent Volume Claims                       | `true`                     |
 | `cronjob.enabled`                                          | Whether to enable/disable cron jobs sidecar                                                         | `false`                    |
 | `cronjob.lifecycle.postStartCommand`                       | Specify deployment lifecycle hook postStartCommand for the cron jobs sidecar                        | `nil`                      |
 | `cronjob.lifecycle.preStopCommand`                         | Specify deployment lifecycle hook preStopCommand for the cron jobs sidecar                          | `nil`                      |
 | `cronjob.resources`                                        | CPU/Memory resource requests/limits for the cron jobs sidecar                                       | `{}`                       |
 | `cronjob.securityContext`                                  | Optional security context for cron jobs sidecar                                                     | `nil`                      |
 | `service.type`                                             | Kubernetes Service type                                                                             | `ClusterIP`                |
 | `service.loadBalancerIP`                                   | LoadBalancerIp for service type LoadBalancer                                                        | `""`                       |
+| `service.annotations`                                      | Annotations for service type                                                                        | `{}`                       |
 | `service.nodePort`                                         | NodePort for service type NodePort                                                                  | `nil`                      |
 | `service.ipFamilies`                                       | Set ipFamilies as in k8s service objects                                                            | `nil`                      |
 | `service.ipFamyPolicy`                                     | define IP protocol bindings as in k8s service objects                                               | `nil`                      |

diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
@@ -3,6 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "nextcloud.name" . }}
     helm.sh/chart: {{ include "nextcloud.chart" . }}
@@ -17,7 +21,7 @@ spec:
   {{- end }}
   {{- end }}
   {{- with .Values.service.ipFamilies }}
-  ipFamilies: 
+  ipFamilies:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.service.ipFamilyPolicy }}
@@ -34,4 +38,4 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "nextcloud.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/component: app
+    app.kubernetes.io/component: app
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -371,6 +371,15 @@ redis:
     existingSecret: ""
     # Password key to be retrieved from existing secret
     existingSecretPasswordKey: ""
+  # Since Redis is used for caching only, you might want to use a storageClass with different reclaim policy and backup settings
+  global:
+    storageClass: ""
+  master:
+    persistence:
+      enabled: true
+  replica:
+    persistence:
+      enabled: true
 
 
 ## Cronjob to execute Nextcloud background tasks
@@ -401,6 +410,9 @@ service:
   port: 8080
   loadBalancerIP: ""
   nodePort: nil
+  annotations: {}
+    ## Insert your annotations such as below
+    # test/test: pumuckel
 
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/