aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/message-router
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:31:17 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:41:20 +0000
commit0e8f8899ca6fdc589316c59f90f8f7283bbfad49 (patch)
tree7c3ed2c2b519b365572ca4a3539320164511c4bd /kubernetes/message-router
parentdeab10d15301b12eee943d7c6151c4300ba2ac2a (diff)
refactor helm files to use namespace prefix
-removed the full namespace from each template. better lets us reuse variables. -made secret end up in a configurable namespace -fixed some bugs where secrets were missing -updated createAll and delete to make use of namespace prefix removing the need for seds to replace the word onap. *** all containers at this point come up in my env. except for aai model loader which is failing cause its still at 1.0 and its trying to talk to a 1.1 sdc and it doesnt auth properly. *** Issue-ID:OOM-215 Change-Id: I15815a01469786a391e272fde4bdaa53ff48091c Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/message-router')
-rw-r--r--kubernetes/message-router/templates/all-services.yaml6
-rw-r--r--kubernetes/message-router/templates/message-router-dmaap.yaml10
-rw-r--r--kubernetes/message-router/templates/message-router-kafka.yaml10
-rw-r--r--kubernetes/message-router/templates/message-router-zookeeper.yaml6
-rw-r--r--kubernetes/message-router/values.yaml2
5 files changed, 17 insertions, 17 deletions
diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 38fee01b22..f190b862aa 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: zookeeper
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
labels:
app: zookeeper
spec:
@@ -17,7 +17,7 @@ apiVersion: v1
kind: Service
metadata:
name: global-kafka
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
labels:
app: global-kafka
spec:
@@ -32,7 +32,7 @@ apiVersion: v1
kind: Service
metadata:
name: dmaap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
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 eda5093178..59c57f85f6 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: dmaap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -64,12 +64,12 @@ spec:
volumes:
- name: appprops
hostPath:
- path: /dockerdata-nfs/onap/message-router/dmaap/MsgRtrApi.properties
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
- name: cadi
hostPath:
- path: /dockerdata-nfs/onap/message-router/dmaap/cadi.properties
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
- name: mykey
hostPath:
- path: /dockerdata-nfs/onap/message-router/dmaap/mykey
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index cb2f3e97bf..19583bf18a 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: global-kafka
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -52,7 +52,7 @@ spec:
periodSeconds: 10
env:
- name: KAFKA_ZOOKEEPER_CONNECT
- value: "zookeeper.onap-message-router:2181"
+ value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181"
- name: KAFKA_ADVERTISED_HOST_NAME
value: "global-kafka"
- name: KAFKA_BROKER_ID
@@ -75,9 +75,9 @@ spec:
path: /var/run/docker.sock
- name: kafka-data
hostPath:
- path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
- name: start-kafka
hostPath:
- path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index ee9faa0c84..5b46dc02e3 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: zookeeper
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -31,6 +31,6 @@ spec:
volumes:
- name: zookeeper-data
hostPath:
- path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml
index b69aa0081a..a3210c29c1 100644
--- a/kubernetes/message-router/values.yaml
+++ b/kubernetes/message-router/values.yaml
@@ -1,4 +1,4 @@
-NS: onap-message-router
+nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0