5 files changed, 16 insertions, 0 deletions
diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 418a3eda89..e76a1d9431 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@ spec:
   selector:
     app: global-kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterDmaap }}
 ---
 apiVersion: v1
 kind: Service
@@ -58,3 +63,4 @@ spec:
   selector:
     app: dmaap
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 1cc79c819e..67d51fd00e 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 1564f9b03a..3e2628b750 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -87,3 +88,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index e31e78c1fd..53329ca29b 100644
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,6 +29,8 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-kafka"
+#{{ end }}
+#{{ if not .Values.disableMessageRouterZookeeper }}
 ---
 apiVersion: v1
 kind: PersistentVolume
@@ -59,3 +62,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml
index 0377beb05a..47cdb51f2f 100644
--- a/kubernetes/message-router/templates/message-router-zookeeper.yaml
+++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -40,3 +41,4 @@ spec:
           claimName: message-router-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file