From 2192ce8c092e081eaab97621d622778e067ff16a Mon Sep 17 00:00:00 2001 From: FreekO Date: Mon, 22 Jul 2024 12:13:00 +0200 Subject: [PATCH 1/2] Add: Redis persistent volumes settings to values (#549) * Add: Redis persistent volumes settings to values Signed-off-by: FreekO * Bump chart version Signed-off-by: FreekO --------- Signed-off-by: FreekO Signed-off-by: JesseBot Co-authored-by: JesseBot --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 3 +++ charts/nextcloud/values.yaml | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index a4e1c078..dae94e71 100644 --- 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.1 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 index 40550fc6..5309f4a9 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -155,6 +155,9 @@ 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® master and replica Persistent Volumes | `''` | +| `redis.master.persistence.enabled` | Enable persistence on Redis® master nodes using Persistent Volume Claims | `true` | +| `redis.replica.persistence.enabled` | Enable persistence on Redis® 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` | diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml index fc3f18e5..2e5d8df4 100644 --- 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 From ddf49e937fe06a086ba216e480c50e05963009e6 Mon Sep 17 00:00:00 2001 From: "We Think Agile (wta)" <418352+wethinkagile@users.noreply.github.com> Date: Mon, 22 Jul 2024 11:35:01 +0100 Subject: [PATCH 2/2] Chart update adding Service Annotations ie for LB Use, Issue #185 (#565) * Chart update adding Service Annotations ie for LB Use, Issue #185 Signed-off-by: Stephan Kristyn * Update charts/nextcloud/templates/service.yaml - use with instead of if/with for annotations Signed-off-by: Jesse Hitch * Update README.md - fix parameter table spacing Signed-off-by: jessebot --------- Signed-off-by: Stephan Kristyn Signed-off-by: jessebot Co-authored-by: Stephan Kristyn Co-authored-by: jessebot --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 1 + charts/nextcloud/templates/service.yaml | 8 ++++++-- charts/nextcloud/values.yaml | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index dae94e71..a81e7869 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 5.2.1 +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 index 5309f4a9..cc569c37 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -165,6 +165,7 @@ The following table lists the configurable parameters of the nextcloud chart and | `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 index 0c5d0327..2223c945 100644 --- 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 \ No newline at end of file diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml index 2e5d8df4..82de3596 100644 --- a/charts/nextcloud/values.yaml +++ b/charts/nextcloud/values.yaml @@ -410,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/