From 93a5b49185695a7960ada82f5899265b5bc2e504 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 27 Nov 2020 11:07:42 +0100
Subject: [COMMON][MARIADB] Upgrade Mariadb DB galera version

Mariadb DB Galera containers version is outdated and unmaintained. We
need them to move to a new image provider.
As new image provider is not compatible with our old templates, we
also update the templates (by reworking bitnami mariadb-galera chart).
An update of global mariadb image is also done in order to match mariadb
galera version.

Issue-ID: OOM-1720
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ib9976227759e90022183d4f37fc655143be4d6ac
---
 .../resources/config/provserver.properties          |  2 +-
 .../dmaap/components/dmaap-dr-prov/values.yaml      | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'kubernetes/dmaap')

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
index d0c3afb9a9..a7472383e2 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
@@ -42,7 +42,7 @@ org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
 
 # Database access
 org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
-org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://{{.Values.config.dmaapDrDb.mariadbServiceName}}:{{.Values.config.dmaapDrDb.mariadbServicePort}}/{{.Values.mariadb.config.mysqlDatabase}}
+org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://{{.Values.config.dmaapDrDb.mariadbServiceName}}:{{.Values.config.dmaapDrDb.mariadbServicePort}}/{{.Values.mariadb.db.name}}
 org.onap.dmaap.datarouter.db.login    = ${DB_USERNAME}
 org.onap.dmaap.datarouter.db.password = ${DB_PASSWORD}
 
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 3d4febcde1..1e8084a758 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -94,28 +94,29 @@ config:
 
   # dr-prov db configuration
   dmaapDrDb:
-    mariadbServiceName: dmaap-dr-db-svc
+    mariadbServiceName: dmaap-dr-db
     mariadbServicePort: 3306
-    mariadbContName: dmaap-dr-db
+    mariadbContName: &dmaap-dr-db dmaap-dr-db
     userName: datarouter
 #    userPassword: password
 #    userCredentialsExternalSecret: some secret
 
 # mariadb-galera configuration
 mariadb:
-  name: dmaap-dr-db
-  nameOverride: dmaap-dr-db
-  replicaCount: 2
-  config:
-    userCredentialsExternalSecret: *dbSecretName
-    mysqlDatabase: datarouter
+  name: *dmaap-dr-db
+  nameOverride: *dmaap-dr-db
+  replicaCount: 3
+  db:
+    externalSecret: *dbSecretName
+    name: datarouter
   service:
-    name: dmaap-dr-db-svc
-    portName: dmaap-dr-db-svc
+    name: dmaap-dr-db
   nfsprovisionerPrefix: dmaap-dr-db
   persistence:
     size: 1Gi
     mountSubPath: data-router/dr-db-data
+  serviceAccount:
+    nameOverride: *dmaap-dr-db
 
 #################################################################
 # AAF part
-- 
cgit 1.2.3-korg