From 76163cdad4ecd5405b859b62bf73a3da48454bec Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 12 Nov 2021 20:59:00 +0100
Subject: [PATCH] feat(nextcloud): use our own redis chart (#1310)

* setup nextcloud to use our own Redis Chart

* also bump common on redis

* bymp redis

* bumps
---
 charts/stable/nextcloud/Chart.yaml            |  8 +++---
 .../stable/nextcloud/templates/_secrets.tpl   | 25 -----------------
 charts/stable/nextcloud/templates/common.yaml |  3 ---
 charts/stable/nextcloud/values.yaml           | 27 ++-----------------
 4 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 charts/stable/nextcloud/templates/_secrets.tpl

diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
index 9dd1608d246..92216d06283 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -3,15 +3,15 @@ appVersion: "22.2.0"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.5.4
+  version: 8.5.6
 - condition: postgresql.enabled
   name: postgresql
   repository: https://truecharts.org/
-  version: 5.1.15
+  version: 5.1.16
 - condition: redis.enabled
   name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 15.5.4
+  repository: https://truecharts.org
+  version: 1.0.0
 deprecated: false
 description: A private cloud server that puts the control and security of your own
   data back into your hands.
diff --git a/charts/stable/nextcloud/templates/_secrets.tpl b/charts/stable/nextcloud/templates/_secrets.tpl
deleted file mode 100644
index 56744138861..00000000000
--- a/charts/stable/nextcloud/templates/_secrets.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{/* Define the secrets */}}
-{{- define "nextcloud.secrets" -}}
-
----
-
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  name: rediscreds
-{{- $redisprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }}
-{{- $redisPass := "" }}
-data:
-{{- if $redisprevious }}
-  {{- $redisPass = ( index $redisprevious.data "redis-password" ) | b64dec  }}
-  redis-password: {{ ( index $redisprevious.data "redis-password" ) }}
-{{- else }}
-  {{- $redisPass = randAlphaNum 50 }}
-  redis-password: {{ $redisPass | b64enc | quote }}
-{{- end }}
-  masterhost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }}
-  slavehost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }}
-type: Opaque
-{{- end -}}
diff --git a/charts/stable/nextcloud/templates/common.yaml b/charts/stable/nextcloud/templates/common.yaml
index e73a8b7783c..801767a012a 100644
--- a/charts/stable/nextcloud/templates/common.yaml
+++ b/charts/stable/nextcloud/templates/common.yaml
@@ -4,9 +4,6 @@
 {{/* Render configmap for nextcloud */}}
 {{- include "nextcloud.configmap" . }}
 
-{{/* Render secrets for nextcloud */}}
-{{- include "nextcloud.secrets" . }}
-
 {{- $newMiddlewares :=  append .Values.ingress.main.fixedMiddlewares "tc-nextcloud-chain" }}
 {{- $_ := set .Values.ingress.main "fixedMiddlewares" $newMiddlewares -}}
 
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index b82292faebb..e871c9e3707 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -53,7 +53,7 @@ envValueFrom:
   REDIS_HOST:
     secretKeyRef:
       name: rediscreds
-      key: masterhost
+      key: plainhost
   REDIS_HOST_PASSWORD:
     secretKeyRef:
       name: rediscreds
@@ -64,16 +64,6 @@ persistence:
     enabled: true
     mountPath: "/var/www/html"
     type: pvc
-    accessMode: ReadWriteOnce
-    size: "100Gi"
-
-  redismaster:
-    noMount: true
-    forceName: "redismaster"
-    enabled: true
-    type: pvc
-    accessMode: ReadWriteOnce
-    size: "100Gi"
 
 # -- Probe configuration
 # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
@@ -155,18 +145,5 @@ postgresql:
 # Enabled redis
 # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/redis
 redis:
-  volumePermissions:
-    enabled: true
-  architecture: standalone
   enabled: true
-  auth:
-    existingSecret: rediscreds
-    existingSecretPasswordKey: redis-password
-  master:
-    persistence:
-      enabled: false
-      existingClaim: redismaster
-  replica:
-    replicaCount: 0
-    persistence:
-      enabled: false
+  existingSecret: "rediscreds"