From 8bfc6cf8c3d338c84c48201f7a4f274958e721a9 Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Tue, 27 Feb 2018 15:04:26 +0000
Subject: Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
---
 kubernetes/message-router/templates/all-services.yaml             | 6 +++---
 kubernetes/message-router/templates/message-router-dmaap.yaml     | 6 +++---
 kubernetes/message-router/templates/message-router-kafka.yaml     | 8 ++++----
 kubernetes/message-router/templates/message-router-pv-pvc.yaml    | 8 ++++----
 kubernetes/message-router/templates/message-router-zookeeper.yaml | 6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kubernetes/message-router/templates')

diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index e76a1d9431..385b5f472d 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: zookeeper
 spec:
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: global-kafka
 spec:
@@ -37,7 +37,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: dmaap
     version: 1.0.0
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 1224e993ed..cc13a382da 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: dmaap
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-dmaap
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.dmaapReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: dmaap
-      name: dmaap
+      name: message-router-dmaap
     spec:
       initContainers:
       - command:
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 94e01b31c0..ca38da414f 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: global-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-global-kafka
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.kafkaReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: global-kafka
-      name: global-kafka
+      name: message-router-global-kafka
     spec:
       initContainers:
       - command:
@@ -43,7 +43,7 @@ spec:
           periodSeconds: 10
         env:
         - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
+          value: "zookeeper.{{ .Values.nsPrefix }}:2181"
         - name: KAFKA_ADVERTISED_HOST_NAME
           value: "global-kafka"
         - name: KAFKA_BROKER_ID
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index 3b85a70b7e..1518913f31 100644
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: "{{ .Values.nsPrefix }}-message-router-kafka"
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: "{{ .Values.nsPrefix }}-message-router-kafka"
 spec:
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: message-router-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -36,7 +36,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
 spec:
@@ -52,7 +52,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: message-router-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index 5a5bc9f355..0dd8723ef0 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: message-router-zookeeper
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.zookeeperReplicas }}
   selector:
@@ -13,7 +13,7 @@ spec:
     metadata:
       labels:
         app: zookeeper
-      name: zookeeper
+      name: message-router-zookeeper
     spec:
       containers:
       - image: {{ .Values.image.zookeeper }}
-- 
cgit 1.2.3-korg