From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 13 Feb 2020 08:09:18 +0000 (+0000)
Subject: Merge "Fix external secret name in mariadb-init"
X-Git-Tag: 6.0.0~389
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7d05036254727b7309a85eb85a82eb634085790a;hp=40f25fdbf7f3818946cbe5f5cbd31cf9469cc037;p=oom.git

Merge "Fix external secret name in mariadb-init"
---

diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index cac6f79f16..f6ce95a65f 100644
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -37,7 +37,7 @@ secrets:
     password: '{{ tpl (default "" .global.mariadbGalera.userRootPassword) . }}'
   - uid: '{{ .Values.config.mysqlDatabase }}'
     type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.mysqlExternalSecret) . }}'
+    externalSecret: '{{ tpl (default "" .Values.config.userCredentialsExternalSecret) . }}'
     login: '{{ .Values.config.userName }}'
     password: '{{ .Values.config.userPassword }}'
     passwordPolicy: required
@@ -56,7 +56,7 @@ config:
   userPassword: Ci@shsOd3pky1Vji
   userName: u5WZ1GMSIS1wHZF
   # set this value if you would like to use external secret instead of providing a password
-  # mysqlExternalsecret: some-secret-name
+  # userCredentialsExternalsecret: some-secret-name
   mysqlDatabase: ynsaUCru6mUNwGal
   mysqlAdditionalDatabases: {}
   # add addtional dabases
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index ba13e3d2f7..29939722d6 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -69,7 +69,7 @@ mariadb-galera:
   # '&mariadbConfig' means we "store" the values for  later use in the file
   # with '*mariadbConfig' pointer.
   config: &mariadbConfig
-    mysqlExternalSecret: '{{ include "common.release" . }}-nbi-db-secret'
+    userCredentialsExternalSecret: '{{ include "common.release" . }}-nbi-db-secret'
     mysqlDatabase: nbi
   nameOverride: nbi-galera
   service: