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>
diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 38fee01..f190b86 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -2,7 +2,7 @@
kind: Service
metadata:
name: zookeeper
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
labels:
app: zookeeper
spec:
@@ -17,7 +17,7 @@
kind: Service
metadata:
name: global-kafka
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
labels:
app: global-kafka
spec:
@@ -32,7 +32,7 @@
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 eda5093..59c57f8 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: dmaap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -64,12 +64,12 @@
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 cb2f3e9..19583bf 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: global-kafka
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -52,7 +52,7 @@
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 @@
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 ee9faa0..5b46dc0 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: zookeeper
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-message-router"
spec:
selector:
matchLabels:
@@ -31,6 +31,6 @@
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"