[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>

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 5e0aed5..c90b86c 100644 (file)
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -74,9 +74,17 @@
 */}}
 {{- define "common.mariadbService" -}}
   {{- if .Values.global.mariadbGalera.localCluster -}}
+  {{-   if .Values.global.mariadbGalera.useOperator }}
+    {{- printf "%s-primary" (index .Values "mariadb-galera" "nameOverride") -}}
+  {{-   else }}
     {{- 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/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index adfa468..2ab9b93 100644 (file)
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -30,7 +30,7 @@ global:
     #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
     globalCluster: true
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 5d8c5e2..8bd5e9b 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -19,7 +19,7 @@ global:
   mariadbGalera: &mariadbGalera
     #This flag allows DMAAP-DR to instantiate its own mariadb-galera cluster
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 0aef0f5..884c6da 100644 (file)
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -27,7 +27,7 @@ global:
     #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
     globalCluster: true
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index b504733..ac97d79 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -24,7 +24,7 @@ global:
     #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
     globalCluster: true
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
   msbEnabled: false

diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 51c6431..33b56dc 100644 (file)
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -21,7 +21,7 @@ global:
     #This flag allows SO to instantiate its own mariadb-galera cluster
     #If shared instance is used, this chart assumes that DB already exists
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index ca6590d..52f23b0 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -21,7 +21,7 @@ global:
     #This flag allows SO to instantiate its own mariadb-galera cluster
     #If shared instance is used, this chart assumes that DB already exists
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 02bc047..d86b58c 100644 (file)
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -21,7 +21,7 @@ global:
     #This flag allows SO to instantiate its own mariadb-galera cluster
     #If shared instance is used, this chart assumes that DB already exists
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 1f21570..2b01a0b 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -27,7 +27,7 @@ global:
     #This flag allows SO to instantiate its own mariadb-galera cluster
     #If shared instance is used, this chart assumes that DB already exists
     localCluster: false
-    service: &mariadbService mariadb-galera-primary
+    service: &mariadbService mariadb-galera
     internalPort: 3306
     nameOverride: &mariadbName mariadb-galera
 

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2b05dbe..7e1f0f7 100644 (file)
--- 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 80d5b67..fa3c592 100755 (executable)
--- 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 619ef03..c5bd850 100755 (executable)
--- 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 c3388d6..2310cce 100644 (file)
--- 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 2084bef..e86aa21 100644 (file)
--- 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 f565eb0..853f019 100755 (executable)
--- 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 8533681..4aa3229 100755 (executable)
--- 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 8e83734..6562d84 100755 (executable)
--- 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 3ce43c6..74679d8 100755 (executable)
--- 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 3b68a36..a33c68a 100755 (executable)
--- 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 5f02a85..8774725 100755 (executable)
--- 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 77b94dd..5805621 100755 (executable)
--- 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 9542ab8..345f874 100755 (executable)
--- 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 81cd1d9..c252938 100755 (executable)
--- 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

diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 1b0fd7c..0cd3ce1 100644 (file)
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -21,7 +21,7 @@ global:
     ssl_enabled: false
   mariadbGalera:
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index 191a6ee..fcad261 100644 (file)
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -21,7 +21,7 @@ global:
     ssl_enabled: false
   mariadbGalera:
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index e6f5654..528bbe0 100644 (file)
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -21,7 +21,7 @@ global:
     ssl_enabled: false
   mariadbGalera:
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 4850c96..c2954d5 100644 (file)
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -21,7 +21,7 @@ global:
     ssl_enabled: false
   mariadbGalera:
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
 

diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 6fa6691..3a15165 100644 (file)
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -32,7 +32,7 @@ global:
   mariadbGalera: &mariadbGalera
     #This flag allows VFC to instantiate its own mariadb-galera cluster
     localCluster: false
-    service: mariadb-galera-primary
+    service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
   centralizedLoggingEnabled: true