diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-01-07 12:44:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-07 12:44:39 +0000 |
| commit | ed0ae6bbf72985a50332a34b147a3bd2c6b25a11 (patch) | |
| tree | a751a743265fcb6608a8fdddbeecc0b37e94117a /kubernetes/common/mariadb-init | |
| parent | 769eebc4d0069f37625b2ac0a5564287e1163111 (diff) | |
| parent | 01c975b4582a2eeb3ad3d72bb4ae61bc18daaae6 (diff) | |
Merge changes I78e22429,Ic101f384,I8dd4128b
* changes:
Use common secret template in mariadb-galera
Improve common secret template
Add secret template to common templates
Diffstat (limited to 'kubernetes/common/mariadb-init')
| -rw-r--r-- | kubernetes/common/mariadb-init/templates/_mariadb.tpl | 2 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-init/values.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/common/mariadb-init/templates/_mariadb.tpl b/kubernetes/common/mariadb-init/templates/_mariadb.tpl index 4f111a5f40..fb3f7974b9 100644 --- a/kubernetes/common/mariadb-init/templates/_mariadb.tpl +++ b/kubernetes/common/mariadb-init/templates/_mariadb.tpl @@ -19,7 +19,7 @@ */}} {{- define "mariadbInit.mariadbClusterSecret" -}} {{- if (eq "default" .Values.global.mariadbGalera.userRootSecret) -}} - {{- printf "%s-mariadb-galera-%s" (include "common.release" .) .Values.global.mariadbGalera.nameOverride -}} + {{- printf "%s-mariadb-galera-%s-db-root-password" (include "common.release" .) .Values.global.mariadbGalera.nameOverride -}} {{- else -}} {{- .Values.global.mariadbGalera.userRootSecret -}} {{- end -}} diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml index 095ff62ddf..d148ba6888 100644 --- a/kubernetes/common/mariadb-init/values.yaml +++ b/kubernetes/common/mariadb-init/values.yaml @@ -24,7 +24,7 @@ global: servicePort: 3306 # set these two values if you want to access an 'out of ONAP' mariadb userRootSecret: default - userRootSecretKey: db-root-password + userRootSecretKey: password ################################################################# # Application configuration defaults. |