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 16d6fcd..1518913 100644 (file)
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -1,10 +1,11 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: message-router-kafka
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: "{{ .Values.nsPrefix }}-message-router-kafka"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: message-router-kafka
+    name: "{{ .Values.nsPrefix }}-message-router-kafka"
 spec:
   capacity:
     storage: 2Gi
@@ -12,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
@@ -27,15 +28,17 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: message-router-kafka
+      name: "{{ .Values.nsPrefix }}-message-router-kafka"
+#{{ end }}
+#{{ if not .Values.disableMessageRouterZookeeper }}
 ---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: message-router-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-message-router"
+  name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: message-router-zookeeper
+    name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
 spec:
   capacity:
     storage: 2Gi
@@ -43,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
@@ -58,4 +61,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: message-router-zookeeper
+      name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
+#{{ end }}