Merge "Eliminate unnecessary node ports"

[oom.git] / kubernetes / sdnc / values.yaml

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 8fd7590..0e7d97f 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -198,7 +198,7 @@ aaf_init:
 
 mariadb-galera: &mariadbGalera
   nameOverride: sdnc-db
-  config:
+  config: &mariadbGaleraConfig
     rootPasswordExternalSecret: '{{ ternary (include "common.release" .)-sdnc-db-root-password "" .Values.global.mariadbGalera.localCluster }}'
     userName: sdnctl
     userCredentialsExternalSecret: *dbSecretName
@@ -217,8 +217,9 @@ cds:
 dmaap-listener:
   nameOverride: sdnc-dmaap-listener
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -229,8 +230,9 @@ dmaap-listener:
 
 ueb-listener:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   nameOverride: sdnc-ueb-listener
   config:
@@ -241,8 +243,9 @@ ueb-listener:
 
 sdnc-portal:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -253,8 +256,9 @@ sdnc-ansible-server:
   config:
     restCredsExternalSecret: *ansibleSecretName
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: ansible
   service:
     name: sdnc-ansible-server
@@ -306,13 +310,10 @@ service:
 
   #port
   externalPort: 8282
-  nodePort: "02"
 
   externalPort2: 8202
-  nodePort2: "08"
 
   externalPort3: 8280
-  nodePort3: 46
 
   externalPort4: 8443
   nodePort4: 67