X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=9b69a4356fa3267b7dd2dc7f73fdb8644819751a;hb=c45c81f10b54f55f0eb3a7d43c2474e28cf05dd2;hp=61d768082437330502412aa1b8ab4a02064f9b8d;hpb=44c4dd905a5b1a825e95ff4d4817616f78f8dd75;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 61d7680824..9b69a4356f 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -42,9 +42,8 @@ certInitializer:
   app_ns: org.osaaf.aaf
   credsPath: /opt/app/osaaf/local
   aaf_add_config: >
-    /opt/app/aaf_config/bin/agent.sh;
-    /opt/app/aaf_config/bin/agent.sh local showpass
-    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
+    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
+    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
 
 aafConfig:
   permission_user: 1000
@@ -55,7 +54,7 @@ aafConfig:
 #################################################################
 secrets:
   - uid: nbi-db-secret
-    name: '{{ include "common.release" . }}-nbi-db-secret'
+    name: &dbUserSecretName '{{ include "common.release" . }}-nbi-db-secret'
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
     login: '{{ .Values.config.db.userName }}'
@@ -66,7 +65,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:7.0.2
+image: onap/externalapi/nbi:10.0.0
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==
@@ -89,23 +88,25 @@ config:
     # userCredentialsExternalSecret: some-secret
 
 mariadb-galera:
-  # '&mariadbConfig' means we "store" the values for  later use in the file
-  # with '*mariadbConfig' pointer.
-  config: &mariadbConfig
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-nbi-db-secret'
-    mysqlDatabase: nbi
-  nameOverride: nbi-galera
+  db:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName nbi
   service:
     name: nbi-galera
     portName: nbi-galera
     internalPort: 3306
+  nameOverride: &nbi-galera nbi-galera
   replicaCount: 1
   persistence:
     enabled: true
     mountSubPath: nbi/maria/data
+  serviceAccount:
+    nameOverride: *nbi-galera
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
 
 mongo:
@@ -180,3 +181,9 @@ resources:
       cpu: 200m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: nbi
+  roles:
+    - read