Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[oom.git] / kubernetes / dmaap / values.yaml

diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 89c8baa..d34efae 100644 (file)
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021-2022 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,15 +20,16 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: onap/oom/readiness:3.0.1
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
   clientImage: onap/dmaap/dbc-client:1.0.9
   repository: nexus3.onap.org:10001
+  busyBoxImage: busybox:1.30
+  busyBoxRepository: docker.io
 
 #Global DMaaP app config
-  allow_http: true
+  allow_http: false
 
   #Logstash config
   logstashServiceName: log-ls
@@ -35,16 +37,37 @@ global:
 
   #dmaap-dr-prov server configuration
   dmaapDrProvName: dmaap-dr-prov
-  dmaapDrProvExtPort2: 8443
-  dmaapDrProvExtPort: 8080
+  dmaapDrProvExtPort2: 443
+  dmaapDrProvExtPort: 80
 
+  #AAF global config overrides
+  aafEnabled: true
+  aafAgentImage: onap/aaf/aaf_agent:2.1.20
+  aafAppNs: org.osaaf.aaf
+  aafLocatorContainer: oom
+
+  #Strimzi config
+  kafkaBootstrap: strimzi-kafka-bootstrap
+  kafkaStrimziAdminUser: strimzi-kafka-admin
+  kafkaInternalPort: 9092
+  saslMechanism: scram-sha-512
 
 #Component overrides
 message-router:
   enabled: true
+  config:
+    jaasConfExternalSecret: '{{ .Values.global.kafkaStrimziAdminUser }}'
 dmaap-bc:
   enabled: true
 dmaap-dr-node:
   enabled: true
 dmaap-dr-prov:
   enabled: true
+dmaap-strimzi:
+  enabled: true
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dmaap
+  roles:
+    - read