Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[oom.git] / kubernetes / aaf / components / aaf-sms / values.yaml

diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index 148d10d..114ad23 100644 (file)
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -18,10 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   persistence: {}
-  envsubstImage: dibi/envsubst
   aafEnabled: true
 
 flavor: small
@@ -58,7 +55,6 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
 image: onap/aaf/sms:4.0.2
 pullPolicy: Always
 
@@ -120,6 +116,9 @@ persistence:
 ingress:
   enabled: false
 
+cps:
+  enabled: true
+
 secrets:
   - uid: aai-creds
     type: basicAuth
@@ -196,7 +195,17 @@ secrets:
     login: '{{ .Values.oofCreds.soUsername }}'
     password: '{{ .Values.oofCreds.soPassword }}'
     passwordPolicy: required
-
+  - uid: sdc-creds
+    type: basicAuth
+    login: '{{ .Values.oofCreds.sdcUsername }}'
+    password: '{{ .Values.oofCreds.sdcPassword }}'
+    passwordPolicy: required
+  - uid: cps-creds
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.oofCreds.cpsUserExternalSecret) . }}'
+    login: '{{ .Values.oofCreds.cpsUsername }}'
+    password: '{{ .Values.oofCreds.cpsPassword }}'
+    passwordPolicy: required
 oofCreds:
   aaiUsername: oof@oof.onap.org
   aaiPassword: demo123456!
@@ -243,6 +252,13 @@ oofCreds:
   soUsername: apihBpmn
   soPassword: password1$
 
+  sdcUsername: aai
+  sdcPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+  cpsUsername: ''
+  cpsPassword: ''
+  cpsUserExternalSecret: '{{ include "common.release" . }}-cps-core-app-user-creds'
+
 # Configure resource requests and limits
 resources:
   small:
@@ -260,3 +276,8 @@ resources:
       cpu: 25m
       memory: 100Mi
   unlimited: {}
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-preload'
+