Run all components in one namespace

[oom.git] / kubernetes / message-router / templates / message-router-pv-pvc.yaml

diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index 53329ca..1518913 100644 (file)
--- 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:
@@ -13,13 +13,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
 ---
 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:
@@ -46,13 +46,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: message-router-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -62,4 +62,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
-#{{ end }}
\ No newline at end of file
+#{{ end }}