X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-dr-node%2Fvalues.yaml;h=d1d2c548332114fa67616ccde1fcef223e491f12;hb=e39d3f9baae8380542f29b5bffe49569de31e0a0;hp=8b44e160baee644d95677ec5685c1e3cf9781d6e;hpb=b4ea1d79cdfdcc9f013a87f63f5ae386dbd8b137;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 8b44e160ba..d1d2c54833 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -19,12 +19,32 @@ global:
   loggingDirectory: /var/log/onap/datarouter
   persistence: {}
   aafEnabled: true
+  centralizedLoggingEnabled: true
+
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+  nameOverride: dmaap-dr-node-cert-initializer
+  aafDeployFqi: deployer@people.osaaf.org
+  aafDeployPass: demo123456!
+  # aafDeployCredsExternalSecret: some secret
+  fqdn: dmaap-dr-node
+  fqi: dmaap-dr-node@dmaap-dr.onap.org
+  public_fqdn: dmaap-dr.onap.org
+  cadi_longitude: "0.0"
+  cadi_latitude: "0.0"
+  app_ns: org.osaaf.aaf
+  credsPath: /opt/app/osaaf/local
+  aaf_add_config: >
+    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
+    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/datarouter-node:2.1.6
+image: onap/dmaap/datarouter-node:2.1.10
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -77,39 +97,10 @@ persistence:
     labels:
       app.kubernetes.io/component: event-logs
 
-job:
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-2"
-    "helm.sh/hook-delete-policy": hook-succeeded
-
-#################################################################
-# AAF part
-#################################################################
-aafConfig:
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  fqdn: dmaap-dr-node
-  fqi: dmaap-dr-node@dmaap-dr.onap.org
-  public_fqdn: dmaap-dr.onap.org
-  cadi_longitude: 0.0
-  cadi_latitude: 0.0
-  app_ns: org.osaaf.aaf
-  permission_user: 1000
-  permission_group: 1001
-  secret_uid: &aaf_secret_uid dmaap-dr-node-aaf-deploy-creds
-  credsPath: /opt/app/osaaf/local
-
 #################################################################
 # Secrets metaconfig
 #################################################################
-secrets:
-  - uid: *aaf_secret_uid
-    type: basicAuth
-    externalSecret: '{{ ternary (tpl (default "" .Values.aafConfig.aafDeployCredsExternalSecret) .) "aafIsDisabled" .Values.global.aafEnabled }}'
-    login: '{{ .Values.aafConfig.aafDeployFqi }}'
-    password: '{{ .Values.aafConfig.aafDeployPass }}'
-    passwordPolicy: required
+secrets: {}
 
 ingress:
   enabled: false
@@ -122,6 +113,11 @@ ingress:
 
 # Resource Limit flavor -By Default using small
 flavor: small
+
+securityContext:
+  user_id: 1000
+  group_id: 1000
+
 # Segregation for Different environment (Small and Large)
 resources:
   small:
@@ -160,3 +156,13 @@ config:
     # dr uses the EELF Logging framework https://github.com/att/EELF
     # and supports the following log levels: TRACE, DEBUG, INFO, WARN, ERROR, OFF
     logLevel: "INFO"
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dmaap-dr-node
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap