[MARIADB] Make the MariaDB service Operator aware

To support both Operator and non-operator deployments
the service name should be either mariadb-galera-primary or
mariadb-galera

Issue-ID: OOM-3236

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

14 files changed, 14 insertions, 14 deletions

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2b05dbed1a..7e1f0f7c9e 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -31,7 +31,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 80d5b67185..fa3c59295e 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -23,7 +23,7 @@ global:
   sdncOamService: sdnc-oam
   sdncOamPort: 8282
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 619ef03775..c5bd850483 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -22,7 +22,7 @@ global:
   app:
     msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml
index c3388d66e4..2310ccebfa 100644
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -19,7 +19,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 2084befa14..e86aa2129b 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index f565eb0a70..853f019795 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 85336813e5..4aa322934b 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -26,7 +26,7 @@ global:
   ubuntuInitRepository: docker.io
   mariadbGalera:
     nameOverride: &mariadbName mariadb-galera
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: "3306"
   migration:
     enabled: false
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 8e83734a9f..6562d8496a 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 3ce43c679c..74679d8a2e 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -21,7 +21,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 # Secrets metaconfig
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 3b68a362cb..a33c68ae00 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 5f02a85eb3..8774725f3e 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 readinessCheck:
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 77b94dde50..5805621668 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -20,7 +20,7 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
   soSdcListenerKafkaUser: so-sdc-list-user
 
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 9542ab8e99..345f8746d8 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -23,7 +23,7 @@ global:
   sdncOamService: sdnc-oam
   sdncOamPort: 8282
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 81cd1d9662..c252938943 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -23,7 +23,7 @@ global:
   mariadbGalera:
     nameOverride: mariadb-galera
     servicePort: '3306'
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: '3306'
     # mariadbRootPassword: secretpassword
     # rootPasswordExternalSecret: some secret