Merge "[MARIADB][POLICY] Correct the MariaDB ReadinessCheck"

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 41259b3..3092298 100644 (file)
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -80,11 +80,7 @@
     {{- index .Values "mariadb-galera" "nameOverride" -}}
   {{-   end }}
   {{- else -}}
-  {{-   if .Values.global.mariadbGalera.useOperator }}
-    {{- printf "%s-primary" (.Values.global.mariadbGalera.service) }}
-  {{-   else }}
     {{- .Values.global.mariadbGalera.service -}}
-  {{-   end }}
   {{- end -}}
 {{- end -}}
 

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index f01160f..9497c3c 100755 (executable)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -29,10 +29,9 @@ global:
     # with '*mariadbConfig' pointer.
     config: &mariadbConfig
       mysqlDatabase: policyadmin
-    service: &mariadbService
-      name: &policy-mariadb policy-mariadb
-      internalPort: 3306
-    nameOverride: *policy-mariadb
+    service: &mariadbService policy-mariadb
+    internalPort: 3306
+    nameOverride: *mariadbService
     # (optional) if localCluster=false and an external secret is used set this variable
     #userRootSecret: <secretName>
   prometheusEnabled: false
@@ -232,9 +231,10 @@ mariadb-galera:
     name: &mysqlDbName policyadmin
   rootUser:
     externalSecret: *dbRootPassSecretName
-  nameOverride: *policy-mariadb
+  nameOverride: *mariadbService
   # mariadb-galera.service and global.mariadbGalera.service must be equals
-  service: *mariadbService
+  service:
+    name: *mariadbService
   replicaCount: 1
   mariadbOperator:
     galera:
@@ -243,7 +243,7 @@ mariadb-galera:
     enabled: true
     mountSubPath: policy/maria/data
   serviceAccount:
-    nameOverride: *policy-mariadb
+    nameOverride: *mariadbService
 
 postgresImage: library/postgres:latest
 # application configuration override for postgres