X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fnetwork-name-gen%2Fvalues.yaml;h=adfa468d6e4f99492db32009d108b15a730187cf;hb=cfd8434fe9484b9219560159094b174421d6d6a2;hp=16a6d281dc670aed10a91102445fdb2649f01d8e;hpb=c0012dda8403fb426d9a6131074b83d9879f0cb5;p=oom.git

diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index 16a6d281dc..adfa468d6e 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -21,20 +21,16 @@ global:
   # with other instances running within the same k8s cluster
   nodePortPrefix: 302
 
-  # image repositories
-  repository: nexus3.onap.org:10001
-
-
-  # readiness check
-  readinessImage: onap/oom/readiness:3.0.1
-
   # image pull policy
   pullPolicy: IfNotPresent
 
   mariadbGalera: &mariadbGalera
     #This flag allows SO to instantiate its own mariadb-galera cluster
+    #When changing it to "true", also set "globalCluster: false"
+    #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
-    service: mariadb-galera
+    globalCluster: true
+    service: mariadb-galera-primary
     internalPort: 3306
     nameOverride: mariadb-galera
 
@@ -43,9 +39,9 @@ global:
 #################################################################
 secrets:
   - uid: neng-db-secret
-    name: '{{ include "common.release" . }}-neng-db-secret'
+    name: &dbUserSecretName '{{ include "common.release" . }}-neng-db-secret'
     type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
+    externalSecret: '{{ tpl (default "" .Values.config.db.externalSecret) . }}'
     login: '{{ .Values.config.db.userName }}'
     password: '{{ .Values.config.db.userPassword }}'
   - uid: pol-basic-auth-secret
@@ -57,28 +53,37 @@ secrets:
 
 # sub-chart config
 mariadb-galera:
-  config: &mariadbConfig
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-neng-db-secret'
-    mysqlDatabase: nengdb
+  db:
+    user: sdnctl
+    # password:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName nengdb
   nameOverride: nengdb
   service:
     name: nengdb
     portName: nengdbport
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
+
   persistence:
     enabled: true
     mountSubPath: network-name-gen/data
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
   nameOverride: nengdb-init
+  serviceAccount:
+    nameOverride: nengdb-init
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/ccsdk-apps-ms-neng:1.0.1
+image: onap/ccsdk-apps-ms-neng:1.4.0
 pullPolicy: IfNotPresent
 
 # application configuration
@@ -91,13 +96,18 @@ config:
   polClientAuth: cHl0aG9uOnRlc3Q=
   polBasicAuthUser: healthcheck
   polBasicAuthPassword: zb!XztG34
-  polUrl: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+  polUrl:
+    https: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+    http: http://policy-xacml-pdp:6969/policy/pdpx/v1/decision
   polEnv: TEST
   polReqId: xx
+  disableHostVerification: true
   aaiCertPass: changeit
   aaiCertPath: /opt/etc/config/aai_keystore
   aaiAuth: QUFJOkFBSQ==
-  aaiUri: https://aai:8443/aai/v14/
+  aaiUri:
+    https: https://aai:8443/aai/v14/
+    http: http://aai:80/aai/v14/
 
 # default number of instances
 replicaCount: 1
@@ -121,7 +131,7 @@ readiness:
 service:
   type: ClusterIP
   name: neng-serv
-  portName: neng-serv-port
+  portName: http
   internalPort: 8080
   externalPort: 8080
 
@@ -129,3 +139,9 @@ ingress:
   enabled: false
 
 resources: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: network-name-gen
+  roles:
+    - read
\ No newline at end of file