X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=3828e25190854829552e2e066dae4dfc970c6967;hb=c8c2a502a15e90110840d3e4cea6d8377419de48;hp=29939722d629668ecd688fdc101e13f85d5c456c;hpb=8cf46b49bfac1ecf613e6910afe32a77ee8d1300;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 29939722d6..a94bd4df4a 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -18,23 +18,43 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.2
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   mariadbGalera: &mariadbGalera
     #This flag allows SO to instantiate its own mariadb-galera cluster
     localCluster: false
     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: >
+    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
+  permission_group: 999
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 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 }}'
@@ -45,7 +65,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:5.0.1
+image: onap/externalapi/nbi:8.0.1
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==
@@ -57,6 +77,8 @@ config:
   logstashServiceName: log-ls
   logstashPort: 5044
   cloudOwner: CloudOwner
+  k8sCloudRegionId: k8sregionfour
+  k8sCloudOwner: k8scloudowner4
   ecompInstanceId: OOM
   openStackRegion: RegionOne
   openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
@@ -66,23 +88,21 @@ 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
-  service:
-    name: nbi-galera
-    portName: nbi-galera
-    internalPort: 3306
+  db:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName nbi
+  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:
@@ -109,9 +129,8 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  httpGet:
-    path: /nbi/api/v4/status
-    port: 8080
+  path: /nbi/api/v4/status
+  port: 8443
   initialDelaySeconds: 180
   periodSeconds: 30
   # necessary to disable liveness probe when setting breakpoints
@@ -119,9 +138,8 @@ liveness:
   enabled: true
 
 readiness:
-  httpGet:
-    path: /nbi/api/v4/status
-    port: 8080
+  path: /nbi/api/v4/status
+  port: 8443
   initialDelaySeconds: 185
   periodSeconds: 30
 
@@ -130,10 +148,16 @@ service:
   portName: api
   name: nbi
   nodePort: 74
-  internalPort: 8080
+  internalPort: 8443
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "nbi.api"
+      name: "nbi"
+      port: 8443
+  config:
+    ssl: "redirect"
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)