1 files changed, 18 insertions, 10 deletions
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 8fd7590863..6cf671ac2d 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -43,8 +43,15 @@ secrets:
   - uid: db-root-password
     name: '{{ include "common.release" . }}-sdnc-db-root-password'
     type: password
-    externalSecret: '{{ .Values.global.mariadbGalera.localCluster | ternary (default (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" (index .Values "mariadb-galera" "nameOverride"))) (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret")) (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
-    password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword" }}'
+    externalSecret: '{{ .Values.global.mariadbGalera.localCluster |
+      ternary (default (include "common.mariadb.secret.rootPassSecretName"
+      (dict "dot" . "chartName"
+      (index .Values "mariadb-galera" "nameOverride")))
+      (index .Values "mariadb-galera" "config"
+      "mariadbRootPasswordExternalSecret"))
+      (include "common.mariadb.secret.rootPassSecretName"
+      (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
+    password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword") }}'
   - uid: db-secret
     name: &dbSecretName '{{ include "common.release" . }}-sdnc-db-secret'
     type: basicAuth
@@ -198,7 +205,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 +224,9 @@ cds:
 dmaap-listener:
   nameOverride: sdnc-dmaap-listener
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -229,8 +237,9 @@ dmaap-listener:
 
 ueb-listener:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   nameOverride: sdnc-ueb-listener
   config:
@@ -241,8 +250,9 @@ ueb-listener:
 
 sdnc-portal:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -253,8 +263,9 @@ sdnc-ansible-server:
   config:
     restCredsExternalSecret: *ansibleSecretName
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: ansible
   service:
     name: sdnc-ansible-server
@@ -306,13 +317,10 @@ service:
 
   #port
   externalPort: 8282
-  nodePort: "02"
 
   externalPort2: 8202
-  nodePort2: "08"
 
   externalPort3: 8280
-  nodePort3: 46
 
   externalPort4: 8443
   nodePort4: 67