[MARIADB] Update mariadb template to the 0.21.0 Operator

In the mariadb-operator version 0.21.0 changes to the CRDs
have been done, which require a change in the template.
see: https://github.com/mariadb-operator/mariadb-operator/pull/248
PeerAuthentication depends on galera setting (not know why)

Issue-ID: OOM-3236

Change-Id: Iaf3cd7128e4c9889c1d56b9b83a72a352e60a39d
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

3 files changed, 15 insertions, 12 deletions

diff --git a/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst b/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
index e84f578c01..8f74ea987e 100644
--- a/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
@@ -123,7 +123,7 @@ Set the default StorageClass
 In some ONAP components it is important to have a default storageClass defined (e.g. cassandra),
 if you don't want to explicitly set it during the deployment via helm overrides.
 
-Therefor you should set the default storageClass (if not done during the K8S cluster setup) via the command:
+Therefor you should set the default storageClass (if not done during the K8S cluster setup) via the command::
 
     > kubectl patch storageclass <storageclass> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
 
@@ -338,7 +338,7 @@ Gateway-API
 Keycloak Installation
 ---------------------
 
-- Add helm repositories
+- Add helm repositories::
 
   > helm repo add bitnami https://charts.bitnami.com/bitnami
 
@@ -346,7 +346,7 @@ Keycloak Installation
 
   > helm repo update
 
-- create keycloak namespace
+- create keycloak namespace::
 
   > kubectl create namespace keycloak
   > kubectl label namespace keycloak istio-injection=enabled
@@ -362,7 +362,7 @@ Install Keycloak-Database
       .. include:: ../../resources/yaml/keycloak-db-values.yaml
          :code: yaml
 
-- Install the Postgres DB
+- Install the Postgres DB::
 
   > helm -n keycloak upgrade -i keycloak-db bitnami/postgresql --values ./keycloak-db-values.yaml
 
@@ -377,7 +377,7 @@ Configure Keycloak
       .. include:: ../../resources/yaml/keycloak-server-values.yaml
          :code: yaml
 
-- Install keycloak
+- Install keycloak::
 
   > helm -n keycloak upgrade -i keycloak codecentric/keycloak --values ./keycloak-server-values.yaml
 
diff --git a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
index e21c4b68c8..e46bee1c04 100644
--- a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
@@ -64,10 +64,10 @@ The versions of software that are supported by OOM are as follows:
 
 .. table:: OOM Software Requirements (optional)
 
-  ==============     ================= ==========
-  Release            Prometheus Stack  K8ssandra
-  ==============     ================= ==========
+  ==============     ================= ========== =================
+  Release            Prometheus Stack  K8ssandra  MariaDB-Operator
+  ==============     ================= ========== =================
   Kohn               35.x
   London             45.x              1.6.1
-  Montreal           45.x              1.8.0
-  ==============     ================= ==========
+  Montreal           45.x              1.9.1      0.21.0
+  ==============     ================= ========== =================
diff --git a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
index 71ce344f09..de26d11944 100644
--- a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
@@ -112,7 +112,7 @@ For setup the K8ssandra operator is used, see `K8ssandra setup guide`_
 
     > kubectl label namespace k8ssandra-operator istio-injection=enabled
 
-- Install the k8ssandra-operator::
+- Install the k8ssandra-operator replacing the <recommended-version> with the version defined in the :ref:`versions_table` table::
 
     > helm repo add k8ssandra https://helm.k8ssandra.io/stable
 
@@ -120,6 +120,7 @@ For setup the K8ssandra operator is used, see `K8ssandra setup guide`_
 
     > helm install k8ssandra-operator --namespace k8ssandra-operator
       k8ssandra/k8ssandra-operator --set global.clusterScoped=true
+      --version=<recommended-version>
 
 Mariadb-Operator Installation
 -----------------------------
@@ -135,7 +136,7 @@ For setup the Mariadb-Operator is used, see `Mariadb-Operator setup guide`_
 
     > kubectl label namespace mariadb-operator istio-injection=enabled
 
-- Install the mariadb-operator::
+- Install the mariadb-operator replacing the <recommended-version> with the version defined in the :ref:`versions_table` table::::
 
     > helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator
 
@@ -143,6 +144,8 @@ For setup the Mariadb-Operator is used, see `Mariadb-Operator setup guide`_
 
     > helm install mariadb-operator --namespace mariadb-operator
       mariadb-operator/mariadb-operator --set ha.enabled=true
+      --set metrics.enabled=true --set webhook.certificate.certManager=true
+      --version=<recommended-version>
 
 
 Kserve Installation