[SO] Cleanup of SO charts

[oom.git] / kubernetes / so / components / so-cnf-adapter / values.yaml

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 66703f2..509925e 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -17,23 +17,11 @@
 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:
-    aaf:
-      enabled: false
-  aaf:
-    auth:
-      header: ${AAF_AUTH}
-
-readinessCheck:
-  wait_for:
-    - so-mariadb-config
-
+  aai:
+    enabled: true
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -57,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
@@ -76,18 +57,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,12 +78,7 @@ db:
   adminName: so_admin
   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!
@@ -110,18 +88,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
@@ -133,13 +109,10 @@ updateStrategy:
   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
@@ -161,7 +134,6 @@ resources:
       memory: 2Gi
       cpu: 1000m
   unlimited: {}
-
 livenessProbe:
   path: /manage/health
   port: 8090
@@ -171,12 +143,14 @@ livenessProbe:
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
-
 ingress:
   enabled: false
-
 nodeSelector: {}
-
 tolerations: []
-
 affinity: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-cnf-adapter
+  roles:
+    - read