Merge "Add option to disable specific deployments"

11 files changed, 32 insertions, 0 deletions

diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml
index 45d22dba21..b0170734dd 100644
--- a/kubernetes/dcae/templates/all-services.yaml
+++ b/kubernetes/dcae/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeKafka }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@ spec:
   selector:
     app: kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeDmaap }}
 ---
 apiVersion: v1
 kind: Service
@@ -48,6 +53,8 @@ spec:
     app: dmaap
   #type: NodePort
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaePgaas }}
 ---
 apiVersion: v1
 kind: Service
@@ -65,6 +72,8 @@ spec:
       targetPort: 5432
       nodePort: {{ .Values.nodePortPrefix }}45
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
 ---
 apiVersion: v1
 kind: Service
@@ -91,6 +100,8 @@ spec:
   selector:
     app: dcae-collector-common-event
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
 ---
 apiVersion: v1
 kind: Service
@@ -115,3 +126,4 @@ spec:
   selector:
     app: dcae-collector-dmaapbc
   type: NodePort
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml
index d438ab9477..c6239e219b 100644
--- a/kubernetes/dcae/templates/cdap0-dep.yaml
+++ b/kubernetes/dcae/templates/cdap0-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml
index efc64da203..64f69d32dd 100644
--- a/kubernetes/dcae/templates/cdap1-dep.yaml
+++ b/kubernetes/dcae/templates/cdap1-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml
index 64f8e300b7..f6d6ec70e4 100644
--- a/kubernetes/dcae/templates/cdap2-dep.yaml
+++ b/kubernetes/dcae/templates/cdap2-dep.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeCdap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -82,3 +83,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
index c77e5a4d96..aa51f140ff 100644
--- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -36,3 +37,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
index a36d5061f2..5de893b867 100644
--- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
+++ b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -35,3 +36,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml
index 459e81e8b3..30f3afb907 100644
--- a/kubernetes/dcae/templates/dcae-controller.yaml
+++ b/kubernetes/dcae/templates/dcae-controller.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaeController }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -59,3 +60,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml
index e1f61e5135..885620b18d 100644
--- a/kubernetes/dcae/templates/dcae-dmaap.yaml
+++ b/kubernetes/dcae/templates/dcae-dmaap.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -73,3 +74,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml
index 9a092264f9..9bfca2bd94 100644
--- a/kubernetes/dcae/templates/dcae-kafka.yaml
+++ b/kubernetes/dcae/templates/dcae-kafka.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeKafka }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -81,3 +82,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/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/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml
index 8d03c9d985..189a03952d 100644
--- a/kubernetes/dcae/templates/dcae-zookeeper.yaml
+++ b/kubernetes/dcae/templates/dcae-zookeeper.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeZookeeper }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -29,3 +30,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml
index de62be501a..788de60231 100644
--- a/kubernetes/dcae/templates/pgaas.yaml
+++ b/kubernetes/dcae/templates/pgaas.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableDcaeDcaePgaas }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -45,3 +46,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file