Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-etsi-nfvo-ns-lcm / values.yaml

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 363ce40..dc6f2b7 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -19,14 +19,8 @@ global:
   nodePortPrefixExt: 304
   persistence:
     mountPath: /dockerdata-nfs
-  security:
-    aaf:
-      enabled: false
-  aaf:
-    auth:
-      header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo=
   mariadbGalera:
-    serviceName: mariadb-galera
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
@@ -55,11 +49,26 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-etsi-nfvo-ns-lcm:1.8.2
+image: onap/so/so-etsi-nfvo-ns-lcm:1.9.0
 pullPolicy: Always
 
 aai:
   auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
+
+readinessCheck:
+  wait_for:
+    jobs:
+      - '{{ include "common.release" . }}-so-mariadb-config-job'
+
+# Local mariadb galera instance default name
+mariadb-galera:
+  nameOverride: so-mariadb-galera
+  service:
+    internalPort: 3306
+  mariadbOperator:
+    galera:
+      enabled: false
+
 db:
   userName: so_user
   userPassword: so_User123
@@ -85,7 +94,6 @@ logPath: ./logs/so-etsi-nfvo-ns-lcm/
 app: so-etsi-nfvo-ns-lcm
 service:
   type: ClusterIP
-  name: so-etsi-nfvo-ns-lcm
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
     msb.onap.org/service-info: |
@@ -111,12 +119,6 @@ updateStrategy:
 # soHelpers part
 #################################################################
 soHelpers:
-  nameOverride: so-nfvo-cert-init
-  certInitializer:
-    nameOverride: so-nfvo-cert-init
-    credsPath: /opt/app/osaaf/local
-  cadi:
-    apiEnforcement: org.onap.so.nfvoAdapterPerm
   containerPort: *containerPort
 
 # Resource Limit flavor -By Default using small
@@ -125,18 +127,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 500m
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      cpu: "2"
+      memory: "5Gi"
     requests:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 livenessProbe:
@@ -150,14 +152,27 @@ livenessProbe:
 ingress:
   enabled: false
   service:
-    - baseaddr: 'soetsinfvonslcm'
+    - baseaddr: 'so-etsi-nfvo-ns-lcm-api'
       name: 'so-etsi-nfvo-ns-lcm'
       port: 9095
   config:
     ssl: 'redirect'
 
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: so-read
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
 nodeSelector: {}
 
 tolerations: []
 
 affinity: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-etsi-nfvo-ns-lcm
+  roles:
+    - read