X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fnetwork-name-gen%2Fvalues.yaml;h=2ab9b93330ab797b6dfb4df1da563e618a5ddcae;hb=95e4811f10b3d177be47d8acb5508fe03d845d12;hp=f49288aeaf357d88667f6f6c31c8d30091d6d7d7;hpb=73e71776a0036eeb5eff5a92eb15145ce1644eea;p=oom.git

diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index f49288aeaf..2ab9b93330 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -21,55 +21,93 @@ global:
   # with other instances running within the same k8s cluster
   nodePortPrefix: 302
 
-  # image repositories
-  repository: nexus3.onap.org:10001
-
-
-  # readiness check
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-
   # 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
+    globalCluster: true
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: neng-db-secret
+    name: &dbUserSecretName '{{ include "common.release" . }}-neng-db-secret'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.config.db.externalSecret) . }}'
+    login: '{{ .Values.config.db.userName }}'
+    password: '{{ .Values.config.db.userPassword }}'
+  - uid: pol-basic-auth-secret
+    name: '{{ include "common.release" . }}-pol-basic-auth-secret'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.config.polBasicAuthSecret) . }}'
+    login: '{{ .Values.config.polBasicAuthUser }}'
+    password: '{{ .Values.config.polBasicAuthPassword }}'
+
 # sub-chart config
 mariadb-galera:
-  config:
-      userName: nenguser
-      userPassword: nenguser123
-      mariadbRootPassword: nenguser123
-      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:
+    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:0.6.2
+image: onap/ccsdk-apps-ms-neng:1.4.0
 pullPolicy: IfNotPresent
 
 # application configuration
 config:
-  dbUrl: jdbc:mysql://nengdb:3306/nengdb
+  db:
+    userName: nenguser
+    # userPassword: password
+    # userCredentialsExternalSecret: some-secret
   springProfile: live
   polClientAuth: cHl0aG9uOnRlc3Q=
-  polBasicAuth: dGVzdHBkcDphbHBoYTEyMw==
-  polUrl: https://pdp:8081/pdp/api/getConfig
+  polBasicAuthUser: healthcheck
+  polBasicAuthPassword: zb!XztG34
+  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
@@ -93,7 +131,7 @@ readiness:
 service:
   type: ClusterIP
   name: neng-serv
-  portName: neng-serv-port
+  portName: http
   internalPort: 8080
   externalPort: 8080
 
@@ -101,3 +139,9 @@ ingress:
   enabled: false
 
 resources: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: network-name-gen
+  roles:
+    - read
\ No newline at end of file