feat(authelia): use our own redis chart (#1312)

* feat(authelia): use our own redis chart

* no message

* hmm

* no message

* small nextcloud UI tweak

charts/stable/authelia/Chart.yaml

@@ -3,15 +3,15 @@ appVersion: "4.32.2"
 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: Authelia is a Single Sign-On Multi-Factor portal for web apps
 home: https://github.com/truecharts/apps/tree/master/charts/stable/authelia
@@ -38,7 +38,7 @@ sources:
 - https://github.com/authelia/chartrepo
 - https://github.com/authelia/authelia
 type: application
-version: 7.0.9
+version: 7.0.10
 annotations:
   truecharts.org/catagories: |
     - security

charts/stable/authelia/templates/_configmap.tpl

@@ -125,7 +125,7 @@ data:
       remember_me_duration: {{ default "1M" $session.remember_me_duration }}
     {{- end }}
       redis:
-        host: {{ ( printf "%v-%v" .Release.Name "redis-master" ) }}
+        host: {{ .Values.redis.url.plain }}
       {{- with $redis := .Values.redisProvider }}
         port: {{ default 6379 $redis.port }}
         {{- if not (eq $redis.username "") }}

charts/stable/authelia/templates/_secrets.tpl

@@ -2,34 +2,6 @@
 {{- define "authelia.secrets" -}}
 ---
 
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  name: rediscreds
-{{- $redisprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }}
-{{- $redisPass := "" }}
-{{- $sentinelPass := "" }}
-data:
-{{- if $redisprevious }}
-  {{- $redisPass = ( index $redisprevious.data "redis-password" ) | b64dec  }}
-  {{- $sentinelPass = ( index $redisprevious.data "redis-password" ) | b64dec  }}
-  redis-password: {{ ( index $redisprevious.data "redis-password" ) }}
-  sentinel-password: {{ ( index $redisprevious.data "sentinel-password" ) }}
-{{- else }}
-  {{- $redisPass = randAlphaNum 50 }}
-  {{- $sentinelPass = randAlphaNum 50 }}
-  redis-password: {{ $redisPass | b64enc | quote }}
-  sentinel-password: {{ $sentinelPass | b64enc | quote }}
-{{- end }}
-  masterhost: {{ ( printf "%v-%v" .Release.Name "redis-master" ) | b64enc | quote }}
-  slavehost: {{ ( printf "%v-%v" .Release.Name "redis-slave" ) | b64enc | quote }}
-type: Opaque
-
-
----
-
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -65,16 +37,9 @@ data:
 
   STORAGE_PASSWORD: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" | b64enc }}
 
-  {{- if $redisprevious }}
-  REDIS_PASSWORD: {{ ( index $redisprevious.data "redis-password" ) }}
+  REDIS_PASSWORD: {{ .Values.redis.redisPassword | trimAll "\"" | b64enc }}
   {{- if .Values.redisProvider.high_availability.enabled}}
-  REDIS_SENTINEL_PASSWORD: {{ ( index $redisprevious.data "sentinel-password" ) }}
-  {{- end }}
-  {{- else }}
-  REDIS_PASSWORD: {{ $redisPass | b64enc | quote }}
-  {{- if .Values.redisProvider.high_availability.enabled}}
-  REDIS_SENTINEL_PASSWORD: {{ $sentinelPass | b64enc | quote }}
-  {{- end }}
+  REDIS_SENTINEL_PASSWORD: {{ .Values.redis.sentinelPassword | trimAll "\"" | b64enc }}
   {{- end }}
 
   {{- if $autheliaprevious }}

charts/stable/authelia/values.yaml

@@ -22,15 +22,6 @@ persistence:
     enabled: true
     mountPath: "/config"
     type: pvc
-    accessMode: ReadWriteOnce
-    size: "100Gi"
-  redismaster:
-    noMount: true
-    forceName: "redismaster"
-    enabled: true
-    type: pvc
-    accessMode: ReadWriteOnce
-    size: "100Gi"
 
 # Enabled postgres
 postgresql:
@@ -42,21 +33,8 @@ 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"
 
 resources:
   limits: {}

charts/stable/nextcloud/questions.yaml

@@ -240,71 +240,6 @@ questions:
                     - value: "Memory"
                       description: "Memory"
 # Include{persistenceAdvanced}
-        - variable: redismaster
-          label: "Redis Storage"
-          description: "Stores the Application redis-master-database."
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable the storage"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: noMount
-                label: "Do not mount this storage inside the main pod"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: forceName
-                label: "Override PVC Name (advanced)"
-                description: "Forces a certain name for the PVC"
-                schema:
-                  type: string
-                  default: "redismaster"
-                  hidden: true
-              - variable: type
-                label: "(Advanced) Type of Storage"
-                description: "Sets the persistence type"
-                schema:
-                  type: string
-                  default: "pvc"
-                  hidden: true
-                  enum:
-                    - value: "pvc"
-                      description: "pvc"
-                    - value: "emptyDir"
-                      description: "emptyDir"
-                    - value: "hostPath"
-                      description: "hostPath"
-              - variable: storageClass
-                label: "(Advanced) storageClass"
-                description: " Warning: Anything other than SCALE-ZFS will break rollback!"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "SCALE-ZFS"
-              - variable: mountPath
-                label: "mountPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  type: string
-                  default: ""
-                  hidden: true
-              - variable: medium
-                label: "EmptyDir Medium"
-                schema:
-                  show_if: [["type", "=", "emptyDir"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "Memory"
-                      description: "Memory"
-# Include{persistenceAdvanced}
 
 # Include{persistenceList}