From: sunil unnava <su622b@att.com>
Date: Wed, 29 Aug 2018 23:11:26 +0000 (-0400)
Subject: Kafka image changes
X-Git-Tag: 3.0.0-ONAP~418^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4b2c4e0b5fb3b106c19aee4839205cfe1ca9c5a6;p=oom.git

Kafka image changes

Update Kafka and dmaap-mr images
Update Kafka environment variables

Issue-ID: DMAAP-628
Change-Id: Id1515bccf605ddde4c507717eabf1ceb99fd0a6a
Signed-off-by: sunil unnava <su622b@att.com>
---

diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
index 5f8b8bb875..ee695f9df7 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
@@ -85,16 +85,14 @@ spec:
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
           value: "{{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}"
-        - name: KAFKA_ADVERTISED_HOST_NAME
-          value: "{{ include "common.servicename" .  }}"
-        - name: KAFKA_BROKER_ID
-          value: "0"
+        - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
+          value: "INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT"
         - name: KAFKA_ADVERTISED_LISTENERS
-          value: PLAINTEXT://{{ include "common.name" .  }}:{{.Values.service.internalPort}}
-        - name: KAFKA_ADVERTISED_PORT
-          value: "{{.Values.service.internalPort}}"
-        - name: KAFKA_PORT
-          value: "{{.Values.service.internalPort}}"
+          value: "INTERNAL_PLAINTEXT://{{ include "common.servicename" .  }}:{{.Values.service.internalPort}}"
+        - name: KAFKA_LISTENERS
+          value: "INTERNAL_PLAINTEXT://0.0.0.0:{{.Values.service.internalPort}}"
+        - name: KAFKA_INTER_BROKER_LISTENER_NAME
+          value: "INTERNAL_PLAINTEXT"
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
index 2fd3c5d5a6..ad1567d81b 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
@@ -29,8 +29,8 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-repository: docker.io
-image: wurstmeister/kafka:1.1.0
+repository: nexus3.onap.org:10001
+image: onap/dmaap/kafka01101:0.0.1
 pullPolicy: Always
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
 
diff --git a/kubernetes/dmaap/charts/message-router/values.yaml b/kubernetes/dmaap/charts/message-router/values.yaml
index 58e60f3414..098ffe1db0 100644
--- a/kubernetes/dmaap/charts/message-router/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-mr:1.1.5
+image: onap/dmaap/dmaap-mr:1.1.6
 pullPolicy: Always
 
 kafka: