X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-cnf-adapter%2Fvalues.yaml;h=3855c19a5093154d6889675c230c9bf5f93fc1ca;hb=db8167bbf6923c8f316ebadd6cec1dd4891428a1;hp=0fdd4f2edf9bd87de80374538928d700a38b88ec;hpb=8078860750eeb57c94758440492d2341241a6d53;p=oom.git

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 0fdd4f2edf..3855c19a50 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -20,12 +20,8 @@ global:
   soCryptoImage: sdesbure/so_crypto:latest
   persistence:
     mountPath: /dockerdata-nfs
-  security:
-    aaf:
-      enabled: false
-  aaf:
-    auth:
-      header: ${AAF_AUTH}
+  aai:
+    enabled: true
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -49,13 +45,6 @@ secrets:
     login: '{{ .Values.server.actuator.username }}'
     password: '{{ .Values.server.actuator.password }}'
     passwordPolicy: required
-  - uid: so-aaf-creds
-    name: '{{ include "common.release" . }}-so-cnf-aaf-creds'
-    type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.server.aafCredsExternalSecret) . }}'
-    login: '{{ .Values.server.aaf.username }}'
-    password: '{{ .Values.server.aaf.password }}'
-    passwordPolicy: required
   - uid: so-aai-creds
     name: '{{ include "common.release" . }}-so-cnf-aai-creds'
     type: basicAuth
@@ -74,8 +63,14 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/mso-cnf-adapter:1.7.1
+image: onap/so/so-cnf-adapter:1.10.0
 pullPolicy: Always
+
+readinessCheck:
+  wait_for:
+    jobs:
+      - '{{ include "common.release" . }}-so-mariadb-config-job'
+
 db:
   userName: so_user
   userPassword: so_User123
@@ -84,10 +79,6 @@ db:
   adminPassword: so_Admin123
   # adminCredsExternalSecret: some secret
 server:
-  aaf:
-    username: so@so.onap.org
-    password: demo123456
-  # aafCredsExternalSecret: some secret
   aai:
     username: aai@aai.onap.org
     password: demo123456!
@@ -106,7 +97,7 @@ mso:
 replicaCount: 1
 minReadySeconds: 10
 containerPort: &containerPort 8090
-logPath: ./logs/cnf/
+logPath: ./logs/cnf-adapter/
 app: cnf-adapter
 service:
   type: ClusterIP
@@ -117,32 +108,31 @@ updateStrategy:
   type: RollingUpdate
   maxUnavailable: 1
   maxSurge: 1
+
+#################################################################
+# soHelpers part
+#################################################################
 soHelpers:
-  nameOverride: so-cnf-cert-init
-  certInitializer:
-    nameOverride: so-cnf-cert-init
-    credsPath: /opt/app/osaaf/local
-  cadi:
-    apiEnforcement: org.onap.so.openStackAdapterPerm
   containerPort: *containerPort
+
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      memory: 1Gi
+      cpu: 1
     requests:
       memory: 1Gi
-      cpu: 500m
+      cpu: 0.5
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      memory: 2Gi
+      cpu: 2
     requests:
       memory: 2Gi
-      cpu: 1000m
+      cpu: 1
   unlimited: {}
 livenessProbe:
   path: /manage/health
@@ -155,7 +145,16 @@ livenessProbe:
   failureThreshold: 3
 ingress:
   enabled: false
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: so-read
 nodeSelector: {}
 tolerations: []
 affinity: {}
 
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-cnf-adapter
+  roles:
+    - read