[EXTAPI] Make NBI ServiceMesh compatible

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

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index bc1f19a..a2111c2 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -25,6 +25,7 @@ global:
     internalPort: 3306
     nameOverride: mariadb-galera
   aafEnabled: true
+  msbEnabled: true
 
 #################################################################
 # AAF part
@@ -42,9 +43,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
@@ -66,7 +66,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:8.0.0-latest
+image: onap/externalapi/nbi:10.0.0
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==
@@ -92,6 +92,10 @@ mariadb-galera:
   db:
     externalSecret: *dbUserSecretName
     name: &mysqlDbName nbi
+  service:
+    name: nbi-galera
+    portName: nbi-galera
+    internalPort: 3306
   nameOverride: &nbi-galera nbi-galera
   replicaCount: 1
   persistence:
@@ -131,7 +135,6 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 180
   periodSeconds: 30
   # necessary to disable liveness probe when setting breakpoints
@@ -140,7 +143,6 @@ liveness:
 
 readiness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 185
   periodSeconds: 30
 
@@ -148,8 +150,13 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  nodePort: 74
   internalPort: 8443
+  internalPlainPort: 8080
+  ports:
+    - name: http
+      port: 8443
+      plain_port: 8080
+      nodePort: '74'
 
 ingress:
   enabled: false
@@ -157,6 +164,7 @@ ingress:
     - baseaddr: "nbi.api"
       name: "nbi"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
@@ -178,3 +186,9 @@ resources:
       cpu: 200m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: nbi
+  roles:
+    - read