diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-08-30 14:21:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-08-30 14:21:39 +0000 |
commit | 37ee6078b8caf2c46ebf1fe0b69b768f9e827e8c (patch) | |
tree | 68e4c6c46a28fe0f8d5646cc1a5cf168764d9822 | |
parent | 157ad0a3b457b8d36e8257f58f5fec6520735d0f (diff) | |
parent | 4b2c4e0b5fb3b106c19aee4839205cfe1ca9c5a6 (diff) |
Merge "Kafka image changes"
3 files changed, 10 insertions, 12 deletions
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: |