feat(nextcloud): use our own redis chart (#1310)

* setup nextcloud to use our own Redis Chart

* also bump common on redis

* bymp redis

* bumps
This commit is contained in:
Kjeld Schouten-Lebbing
2021-11-12 20:59:00 +01:00
committed by GitHub
parent c518b412cd
commit 76163cdad4
4 changed files with 6 additions and 57 deletions
+4 -4
View File
@@ -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.
@@ -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 -}}
@@ -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 -}}
+2 -25
View File
@@ -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"