feat(authelia): use our own redis chart (#1312)
* feat(authelia): use our own redis chart * no message * hmm * no message * small nextcloud UI tweak
This commit is contained in:
@@ -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 "") }}
|
||||
|
||||
@@ -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 }}
|
||||
|
||||
Reference in New Issue
Block a user