X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-dr-prov%2Fvalues.yaml;h=7564ccfc7864261a6ab6db92c5380015678db59d;hb=13388baca0e98f0f870ba77f40e2e2a944cf08d0;hp=6165568971dc5d1bf43d9cbff820e4e395ac275b;hpb=512bafc2e717582ac9d4ac1aa6660a1edf2ec90e;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 6165568971..7564ccfc78 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -18,13 +18,14 @@
 global:
   nodePortPrefix: 302
   loggingDirectory: /opt/app/datartr/logs
+  persistence: {}
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 secrets:
   - uid: dmaap-dr-db-user-secret
-    name: '{{ include "common.release" . }}-dmaap-dr-db-user-secret'
+    name: &dbSecretName '{{ include "common.release" . }}-dmaap-dr-db-user-secret'
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.dmaapDrDb.userCredentialsExternalSecret) . }}'
     login: '{{ .Values.config.dmaapDrDb.userName }}'
@@ -34,7 +35,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/datarouter-prov:2.1.4
+image: onap/dmaap/datarouter-prov:2.1.8
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -63,14 +64,11 @@ readiness:
 
 ## Persist data to a persitent volume
 persistence:
+  enabled: true
   volumeReclaimPolicy: Retain
   accessMode: ReadWriteOnce
   mountPath: /dockerdata-nfs
 
-  aafCredsMountSubPath: data-router/dr-prov/aaf-props
-  aafCredsSize: 10M
-  aafCredsPath: /opt/app/osaaf/local
-
 ingress:
   enabled: false
   service:
@@ -96,39 +94,46 @@ config:
 
   # dr-prov db configuration
   dmaapDrDb:
-    mariadbServiceName: dmaap-dr-db-svc
+    mariadbServiceName: dmaap-dr-db
     mariadbServicePort: 3306
-    mariadbContName: dmaap-dr-db
+    mariadbContName: &dmaap-dr-db dmaap-dr-db
     userName: datarouter
 #    userPassword: password
 #    userCredentialsExternalSecret: some secret
 
 # mariadb-galera configuration
 mariadb:
-  name: dmaap-dr-db
-  nameOverride: dmaap-dr-db
-  replicaCount: 2
-  config:
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-dmaap-dr-db-user-secret'
-    mysqlDatabase: datarouter
+  name: *dmaap-dr-db
+  nameOverride: *dmaap-dr-db
+  replicaCount: 1
+  db:
+    externalSecret: *dbSecretName
+    name: datarouter
   service:
-    name: dmaap-dr-db-svc
-    portName: dmaap-dr-db-svc
+    name: dmaap-dr-db
   nfsprovisionerPrefix: dmaap-dr-db
   persistence:
     size: 1Gi
     mountSubPath: data-router/dr-db-data
-  disableNfsProvisioner: true
+  serviceAccount:
+    nameOverride: *dmaap-dr-db
 
-#AAF local config
-aafConfig:
-  aafDeployFqi: dmaap-dr@dmaap-dr.onap.org
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+  nameOverride: dmaap-dr-prov-cert-initializer
+  aafDeployFqi: deployer@people.osaaf.org
   aafDeployPass: demo123456!
+# aafDeployCredsExternalSecret: some secret
   fqdn: dmaap-dr-prov
   fqi: dmaap-dr-prov@dmaap-dr.onap.org
   publicFqdn: dmaap-dr.onap.org
   cadiLatitude: 0.0
   cadiLongitude: 0.0
+  app_ns: org.osaaf.aaf
+  credsPath: /opt/app/osaaf/local
+
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -149,3 +154,9 @@ resources:
       cpu: 1000m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dmaap-dr-prov
+  roles:
+    - read