Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMAAP] Introduce drprov-client
[oom.git]
/
kubernetes
/
common
/
common
/
templates
/
_createPassword.tpl
diff --git
a/kubernetes/common/common/templates/_createPassword.tpl
b/kubernetes/common/common/templates/_createPassword.tpl
index
bfa96da
..
4ded11f
100644
(file)
--- a/
kubernetes/common/common/templates/_createPassword.tpl
+++ b/
kubernetes/common/common/templates/_createPassword.tpl
@@
-24,14
+24,17
@@
*/}}
{{- define "common.masterPassword" -}}
{{ if .Values.masterPasswordOverride }}
*/}}
{{- define "common.masterPassword" -}}
{{ if .Values.masterPasswordOverride }}
- {{- printf "%
d
" .Values.masterPasswordOverride -}}
+ {{- printf "%
s
" .Values.masterPasswordOverride -}}
{{ else if .Values.global.masterPassword }}
{{ else if .Values.global.masterPassword }}
- {{- printf "%
d
" .Values.global.masterPassword -}}
+ {{- printf "%
s
" .Values.global.masterPassword -}}
{{ else if .Values.masterPassword }}
{{ else if .Values.masterPassword }}
- {{- printf "%
d
" .Values.masterPassword -}}
+ {{- printf "%
s
" .Values.masterPassword -}}
{{ else if eq "testRelease" (include "common.release" .) }}
{{/* Special case for chart liniting. DON"T NAME YOUR PRODUCTION RELEASE testRelease */}}
{{- printf "testRelease" -}}
{{ else if eq "testRelease" (include "common.release" .) }}
{{/* Special case for chart liniting. DON"T NAME YOUR PRODUCTION RELEASE testRelease */}}
{{- printf "testRelease" -}}
+ {{ else if eq "test-release" .Release.Name }}
+ {{/* Special case for chart linting in helm3. DON"T NAME YOUR PRODUCTION RELEASE test-release */}}
+ {{- printf "testRelease" -}}
{{ else }}
{{ fail "masterPassword not provided" }}
{{ end }}
{{ else }}
{{ fail "masterPassword not provided" }}
{{ end }}