aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-01-15 16:27:47 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-01-21 10:06:28 +0100
commit199a8dc9efb0f7f3bf3bff2854a749d4b5f7787f (patch)
treedc0930091f3b406f5fb93235aaba8e537b2c76e2
parent0422de8134484d59031bf3113a3ac03e86627fac (diff)
[DMAAP][MR] Service Mesh compatibility
In order to make DMaaP Message Router to work, a change in Zookeeper has to be done so it's listening on all Interfaces. Also, rename service port names in order to follow istio best practices. Issue-ID: OOM-2233 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I4ed3426c57439d40ff48c7fbbc6d2e970924b7f2
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/service.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml6
4 files changed, 7 insertions, 5 deletions
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/service.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/service.yaml
index b9472444a3..88c83981bb 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/service.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/service.yaml
@@ -32,7 +32,7 @@ spec:
type: {{ $root.Values.service.type }}
externalTrafficPolicy: Local
selector:
- statefulset.kubernetes.io/pod-name: {{ include "common.release" $root }}-{{ $root.Values.service.name }}-{{ $i }}
+ statefulset.kubernetes.io/pod-name: {{ include "common.release" $root }}-{{ $root.Values.service.name }}-{{ $i }}
ports:
- port: {{ $root.Values.service.externalPort }}
targetPort: {{ $root.Values.service.externalPort }}
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..6c3cbc385a 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
@@ -159,7 +159,7 @@ persistence:
service:
type: NodePort
name: message-router-kafka
- portName: message-router-kafka
+ portName: tcp-message-router-kafka
internalPort: 9092
internalSSLPort: 9093
externalPort: 9091
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
index 52eff32242..5ea5bc53b7 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
@@ -163,6 +163,8 @@ spec:
value: "{{ .Values.zkConfig.clientPort }}"
- name: KAFKA_OPTS
value: "{{ .Values.zkConfig.kafkaOpts }}"
+ - name: ZOOKEEPER_QUORUM_LISTEN_ON_ALL_IPS
+ value: "true"
- name: ZOOKEEPER_SERVER_ID
valueFrom:
fieldRef:
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
index 2da42a4604..64c29db935 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
@@ -122,11 +122,11 @@ service:
type: ClusterIP
name: message-router-zookeeper
portName: message-router-zookeeper
- clientPortName: client
+ clientPortName: tcp-client
clientPort: 2181
- serverPortName: server
+ serverPortName: tcp-server
serverPort: 2888
- leaderElectionPortName: leader-election
+ leaderElectionPortName: tcp-leader
leaderElectionPort: 3888
ingress: