X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=3591d94cc1c0fab61710e59ed9d6f5f4a5db0efc;hb=d804418c890dde93bff26125b8cf1a9fd7fc82d1;hp=7b9c15083c8e64c5cc2aa3f622da26cc8c243cd1;hpb=627c03abaea32594b4b518ff6a965363f4a73fc5;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 7b9c15083c..3591d94cc1 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -20,35 +20,14 @@ global:
   nodePortPrefix: 302
   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
-  aafEnabled: true
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: nbi-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: nbi
-  fqi: nbi@nbi.onap.org
-  public_fqdn: nbi.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  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
-
-aafConfig:
-  permission_user: 1000
-  permission_group: 999
+  msbEnabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -66,7 +45,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:8.0.1
+image: onap/externalapi/nbi:10.0.0
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==
@@ -92,6 +71,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:
@@ -105,6 +88,8 @@ mariadb-init:
     userCredentialsExternalSecret: *dbUserSecretName
     mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
+  serviceAccount:
+    nameOverride: nbi-config
 
 mongo:
   nameOverride: nbi-mongo
@@ -131,7 +116,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 +124,6 @@ liveness:
 
 readiness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 185
   periodSeconds: 30
 
@@ -148,15 +131,18 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  nodePort: 74
-  internalPort: 8443
+  internalPort: 8080
+  ports:
+    - name: http
+      port: 8080
+      nodePort: '74'
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "nbi.api"
+    - baseaddr: "nbi-api"
       name: "nbi"
-      port: 8443
+      port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
@@ -165,16 +151,22 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 2Gi
+      cpu: 999
+      memory: 1Gi
     requests:
-      cpu: 100m
+      cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: 999
+      memory: 2Gi
     requests:
-      cpu: 200m
+      cpu: 1
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: nbi
+  roles:
+    - read