X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-cnf-adapter%2Fvalues.yaml;h=6d7eec4a644a38b4a5ab9120f62427655368f6d4;hb=b10781bad2cdf34a3754937714a77b2fbeaa8e21;hp=66703f2597aa6577634ede2687bdfc3548992991;hpb=d055a17d87b9e6bbfde51f523eea1838bc6b40dd;p=oom.git

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 66703f2597..6d7eec4a64 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -17,10 +17,7 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-  repository: nexus3.onap.org:10001
-  readinessImage: oomk8s/readiness-check:2.2.2
   soCryptoImage: sdesbure/so_crypto:latest
-  dockerHubRepository: docker.io
   persistence:
     mountPath: /dockerdata-nfs
   security:
@@ -29,11 +26,8 @@ global:
   aaf:
     auth:
       header: ${AAF_AUTH}
-
-readinessCheck:
-  wait_for:
-    - so-mariadb-config
-
+  aai:
+    enabled: true
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -76,18 +70,20 @@ secrets:
     type: password
     externalSecret: '{{ tpl (default "" .Values.mso.msoKeySecret) . }}'
     password: '{{ .Values.mso.msoKey }}'
-
 #secretsFilePaths: |
 #  - 'my file 1'
 #  - '{{ include "templateThatGeneratesFileName" . }}'
-
 #################################################################
 # Application configuration defaults.
 #################################################################
-repository: nexus3.onap.org:10001
-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
@@ -95,7 +91,6 @@ db:
   adminName: so_admin
   adminPassword: so_Admin123
   # adminCredsExternalSecret: some secret
-
 server:
   aaf:
     username: so@so.onap.org
@@ -110,18 +105,16 @@ server:
     username: mso_admin
     password: password1$
   # actuatorCredsExternalSecret: some secret
-
 mso:
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   # msoKeySecret: some secret
   adapters:
     requestDb:
       auth: ${REQUEST_AUTH}
-
 replicaCount: 1
 minReadySeconds: 10
 containerPort: &containerPort 8090
-logPath: ./logs/cnf/
+logPath: ./logs/cnf-adapter/
 app: cnf-adapter
 service:
   type: ClusterIP
@@ -132,7 +125,6 @@ updateStrategy:
   type: RollingUpdate
   maxUnavailable: 1
   maxSurge: 1
-
 soHelpers:
   nameOverride: so-cnf-cert-init
   certInitializer:
@@ -141,7 +133,6 @@ soHelpers:
   cadi:
     apiEnforcement: org.onap.so.openStackAdapterPerm
   containerPort: *containerPort
-
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
@@ -161,7 +152,6 @@ resources:
       memory: 2Gi
       cpu: 1000m
   unlimited: {}
-
 livenessProbe:
   path: /manage/health
   port: 8090
@@ -171,12 +161,14 @@ livenessProbe:
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
-
 ingress:
   enabled: false
-
 nodeSelector: {}
-
 tolerations: []
-
 affinity: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-cnf-adapter
+  roles:
+    - read