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

diff --combined kubernetes/onap/values.yaml
index f3a887a,ac6f84c..83dfbfb
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -47,7 -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 +97,7 @@@
    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,10 -141,11 +141,10 @@@
    # to the desired value
    # logLevel: DEBUG
  
-   #Global ingress configuration
+   # Global ingress configuration
    ingress:
      enabled: false
      virtualhost:
 -      enabled: true
        baseurl: "simpledemo.onap.org"
  
    # Global Service Mesh configuration
@@@ -153,6 -154,16 +153,16 @@@
      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 -352,6 +351,6 @@@ so
    #   server:
    #     monitoring:
    #       password: demo123456!
- 
-   # configure embedded mariadb
-   mariadb:
-     config:
-       mariadbRootPassword: password
  uui:
    enabled: false
  vfc: