DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

fix(common): add default dbindex for redis (#1563)

Browse Source
This commit is contained in:
Stavros Kois
2021-12-18 23:37:12 +01:00
committed by GitHub
parent 9f13f713be
commit c68633145e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.9.22 version: 8.9.23
charts/library/common/templates/lib/dependencies/_redisInjector.tpl
+2 -1
View File
@@ -14,6 +14,7 @@ metadata:
name: rediscreds name: rediscreds
{{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }} {{- $dbprevious := lookup "v1" "Secret" .Release.Namespace "rediscreds" }}
{{- $dbPass := "" }} {{- $dbPass := "" }}
{{- $dbIndex := default "0" .Values.redis.redisDatabase }}
data: data:
{{- if $dbprevious }} {{- if $dbprevious }}
{{- $dbPass = ( index $dbprevious.data "redis-password" ) | b64dec }} {{- $dbPass = ( index $dbprevious.data "redis-password" ) | b64dec }}
@@ -22,7 +23,7 @@ data:
{{- $dbPass = randAlphaNum 50 }} {{- $dbPass = randAlphaNum 50 }}
redis-password: {{ $dbPass | b64enc | quote }} redis-password: {{ $dbPass | b64enc | quote }}
{{- end }} {{- end }}
url: {{ ( printf "redis://%v:%v@%v-redis:6379/%v" .Values.redis.redisUsername $dbPass .Release.Name .Values.redis.redisDatabase ) | b64enc | quote }} url: {{ ( printf "redis://%v:%v@%v-redis:6379/%v" .Values.redis.redisUsername $dbPass .Release.Name $dbIndex ) | b64enc | quote }}
plainporthost: {{ ( printf "%v-%v" .Release.Name "redis" ) | b64enc | quote }} plainporthost: {{ ( printf "%v-%v" .Release.Name "redis" ) | b64enc | quote }}
plainhost: {{ ( printf "%v-%v" .Release.Name "redis" ) | b64enc | quote }} plainhost: {{ ( printf "%v-%v" .Release.Name "redis" ) | b64enc | quote }}
type: Opaque type: Opaque