X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fmessage-router%2Fcomponents%2Fmessage-router-kafka%2Fvalues.yaml;h=c998e9ec679c99d78a480d472d5f631a72e6954d;hb=0d5c917c02b40b335251a39952bb46f70bcb73ce;hp=03f8afa18244fce9bfcb0c3c933e314a4bb5af13;hpb=6b09654a7772371942de7e75ac4ce0a60b1065a8;p=oom.git

diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
index 03f8afa182..c998e9ec67 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
@@ -20,17 +20,47 @@ global:
   nodePortPrefix: 302
   persistence: {}
 
+
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+  nameOverride: dmaap-mr-kafka-cert-initializer
+  aafDeployFqi: deployer@people.osaaf.org
+  aafDeployPass: demo123456!
+  # aafDeployCredsExternalSecret: some secret
+  fqdn: dmaap-mr
+  fqi: dmaapmr@mr.dmaap.onap.org
+  public_fqdn: mr.dmaap.onap.org
+  cadi_longitude: "-122.26147"
+  cadi_latitude: "37.78187"
+  app_ns: org.osaaf.aaf
+  credsPath: /opt/app/osaaf/local
+  fqi_namespace: org.onap.dmaap.mr
+  final_cadi_files: cadi.properties
+  aaf_add_config: |
+    echo "*** concat the three prop files"
+    cd {{ .Values.credsPath }}
+    cat {{ .Values.fqi_namespace }}.props > {{ .Values.final_cadi_files }}
+    cat {{ .Values.fqi_namespace }}.cred.props >> {{ .Values.final_cadi_files }}
+    cat {{ .Values.fqi_namespace }}.location.props >> {{ .Values.final_cadi_files }}
+    echo "*** configuration result:"
+    cat {{ .Values.final_cadi_files }}
+    chown -R 1000 .
+
+
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/kafka111:1.0.4
+image: onap/dmaap/kafka111:1.1.1
 pullPolicy: Always
 
 
 zookeeper:
   name: message-router-zookeeper
   port: 2181
+  replicaCount: 1
 
 kafka:
   heapOptions: -Xmx5G -Xms1G
@@ -47,19 +77,18 @@ kafka:
   interBrokerListernerAaf: INTERNAL_SASL_PLAINTEXT
   interBrokerListerner: INTERNAL_PLAINTEXT
 
+config: {}
+  # offsets_topic_replication_factor:
+  # num_partition:
+  # default_replication_factor:
 
 configurationOverrides:
-  "offsets.topic.replication.factor": "3"
   "log.dirs": "/var/lib/kafka/data"
   "log.retention.hours": "168"
-  "num.partitions": "3"
-  "offsets.topic.replication.factor": "3"
   "transaction.state.log.replication.factor": "1"
   "transaction.state.log.min.isr": "1"
   "num.recovery.threads.per.data.dir": "5"
-  "log.retention.hours": "168"
   "zookeeper.connection.timeout.ms": "6000"
-  "default.replication.factor": "3"
   "zookeeper.set.acl": "true"
 
 jmx:
@@ -100,7 +129,7 @@ secrets:
 debugEnabled: false
 
 # default number of instances
-replicaCount: 3
+replicaCount: 1
 
 
 # To access Kafka outside cluster, this value must be set to hard and the number of nodes in K8S cluster must be equal or greater then replica count
@@ -121,7 +150,7 @@ tolerations: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 70
+  initialDelaySeconds: 90
   periodSeconds: 20
   timeoutSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
@@ -159,7 +188,7 @@ persistence:
 service:
   type: NodePort
   name: message-router-kafka
-  portName: message-router-kafka
+  portName: tcp-message-router-kafka
   internalPort: 9092
   internalSSLPort: 9093
   externalPort: 9091
@@ -189,3 +218,9 @@ resources:
       cpu: 1000m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: message-router-kafka
+  roles:
+    - read