From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Sat, 8 Feb 2020 00:07:21 +0000 (+0100)
Subject: Fix external secret name in mariadb-init
X-Git-Tag: 6.0.0~389^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8cf46b49bfac1ecf613e6910afe32a77ee8d1300;p=oom.git

Fix external secret name in mariadb-init

mariadb-init chart should play nicely with mariadb-galera as it
simplifies migration to common mariadb instance.

Unfortunately after adding the support for common secret template I
didn't pay enough attention to consistent naming convention and
mariadb-galera and mariadb-init chart ended up being incompatible. To
fix that let's just rename the mariadb-init chart config option to
match exactly the one used in mariadb-galera chart.

Issue-ID: OOM-2248
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I621804821292e2bd0b5b1dd3f010629d1cb5471f
---

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: