Merge "[COMMON][MARIADB] Upgrade Mariadb DB galera version"

1 files changed, 13 insertions, 8 deletions

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index f3a887a763..83dfbfb2ef 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -47,7 +47,7 @@ global:
   dockerHubRepository: &dockerHubRepository docker.io
   elasticRepository: &elasticRepository docker.elastic.co
   googleK8sRepository: k8s.gcr.io
- 
+
 
   #/!\ DEPRECATED /!\
   # Legacy repositories which will be removed at the end of migration.
@@ -97,7 +97,7 @@ global:
   loggingImage: beats/filebeat:5.5.0
 
   # mariadb client image
-  mariadbImage: mariadb:10.1.48
+  mariadbImage: bitnami/mariadb:10.5.8
 
   # nginx server image
   nginxImage: bitnami/nginx:1.18-debian-10
@@ -141,7 +141,7 @@ global:
   # to the desired value
   # logLevel: DEBUG
 
-  #Global ingress configuration
+  # Global ingress configuration
   ingress:
     enabled: false
     virtualhost:
@@ -153,6 +153,16 @@ global:
     enabled: false
     tls: true
 
+  # metrics part
+  # If enabled, exporters (for prometheus) will be deployed
+  # if custom resources set to yes, CRD from prometheus operartor will be
+  # created
+  # Not all components have it enabled.
+  #
+  metrics:
+    enabled: true
+    custom_resources: false
+
   # Disabling AAF
   # POC Mode, only for use in development environment
   # Keep it enabled in production
@@ -341,11 +351,6 @@ so:
   #   server:
   #     monitoring:
   #       password: demo123456!
-
-  # configure embedded mariadb
-  mariadb:
-    config:
-      mariadbRootPassword: password
 uui:
   enabled: false
 vfc: