Removing DCAE

Issue-ID: OOM-772

Change-Id: Idb0dad8cf16d662d7278d27fecd3ed38226d24a4
Signed-off-by: Priyanka <Priyanka.Jain3@amdocs.com>

11 files changed, 0 insertions, 884 deletions

diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml
deleted file mode 100644
index 998f97d3bd..0000000000
--- a/kubernetes/dcae/templates/all-services.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeZookeeper }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: zookeeper
-spec:
-  ports:
-  - name: zookeeper1
-    port: 2181
-  selector:
-    app: zookeeper
-  clusterIP: None
-#{{ end }}
-#{{ if not .Values.disableDcaeKafka }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: kafka
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: kafka
-spec:
-  ports:
-  - name: kafka1
-    port: 9092
-  selector:
-    app: kafka
-  clusterIP: None
-#{{ end }}
-#{{ if not .Values.disableDcaeDmaap }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: dmaap
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: dmaap
-    version: 1.1.0
-spec:
-  ports:
-  - name: mr1
-    port: 3904
-    #nodePort: {{ .Values.nodePortPrefix }}27
-  - name: mr2
-    port: 3905
-    #nodePort: {{ .Values.nodePortPrefix }}26
-  selector:
-    app: dmaap
-  #type: NodePort
-  clusterIP: None
-#{{ end }}
-#{{ if not .Values.disableDcaeDcaePgaas }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: zldciad4vipstg00
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: dcae-pgaas
-spec:
-  selector:
-    app: dcae-pgaas
-  ports:
-    - port: 5432
-      protocol: TCP
-      targetPort: 5432
-      nodePort: {{ .Values.nodePortPrefix }}45
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: dcae-collector-common-event
-    version: latest
-  name: dcae-collector-common-event
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  ports:
-  - name: dcae-ce1
-    port: 8080
-    protocol: TCP
-    nodePort: {{ .Values.nodePortPrefix }}36
-  - name: dcae-ce2
-    port: 8443
-    protocol: TCP
-    nodePort: {{ .Values.nodePortPrefix }}37
-  - name: dcae-ce3
-    port: 9999
-    protocol: TCP
-    nodePort: {{ .Values.nodePortPrefix }}38
-  selector:
-    app: dcae-collector-common-event
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: dcae-collector-dmaapbc
-    version: latest
-  name: dcae-collector-dmaapbc
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  ports:
-  - name: dcae-bc1
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-    nodePort: {{ .Values.nodePortPrefix }}39
-  - name: dcae-bc2
-    port: 8443
-    protocol: TCP
-    targetPort: 8443
-    nodePort: {{ .Values.nodePortPrefix }}40
-  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
deleted file mode 100644
index 5b0e465ed8..0000000000
--- a/kubernetes/dcae/templates/cdap0-dep.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeCdap }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "1"
-  labels:
-    app: cdap0
-  name: cdap0
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: cdap0
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: cdap0
-      name: cdap0
-    spec:
-      initContainers:
-      - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap0-opt-tools,cdap0-opt-data,pod-ip}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3];  do sleep 1; done"]
-        name: create-fs
-        image: {{ .Values.image.cdapfs }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-      hostname: zldcprivatecloudtruecdap00
-      containers:
-      - image: {{ .Values.image.cdap }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        command: ["/bin/bash"]
-        args: ["-c", "cat /cdap/pod-ip/* >> /etc/hosts; /usr/local/bin/01-entrypoint.sh; sleep infinity;"]
-        name: cdap0
-        ports:
-        - containerPort: 8020
-          protocol: TCP
-        - containerPort: 8025
-          protocol: TCP
-        - containerPort: 50070
-          protocol: TCP
-        - containerPort: 50075
-          protocol: TCP
-        - containerPort: 50010
-          protocol: TCP
-        - containerPort: 50020
-          protocol: TCP
-        - containerPort: 3888
-          protocol: TCP
-        - containerPort: 2888
-          protocol: TCP
-        - containerPort: 2181
-          protocol: TCP
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-        - mountPath: /opt/tools
-          name: dcae-cdap0-opt-tools
-        - mountPath: /opt/data
-          name: dcae-cdap0-opt-data
-      volumes:
-      - name: cdap-root
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap
-      - name: dcae-cdap0-opt-tools
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-tools
-      - name: dcae-cdap0-opt-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml
deleted file mode 100644
index 1a954c8632..0000000000
--- a/kubernetes/dcae/templates/cdap1-dep.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeCdap }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "1"
-  labels:
-    app: cdap1
-  name: cdap1
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: cdap1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: cdap1
-      name: cdap1
-    spec:
-      initContainers:
-      - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap1-opt-tools,cdap1-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3];  do sleep 1; done"]
-        name: create-fs
-        image: {{ .Values.image.cdapfs }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-      hostname: zldcprivatecloudtruecdap01
-      containers:
-      - image: {{ .Values.image.cdap }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        command: ["/bin/bash"]
-        args: ["-c", "cat /cdap/pod-ip/* >> /etc/hosts; /usr/local/bin/01-entrypoint.sh; sleep infinity;"]
-        name: cdap1
-        ports:
-        - containerPort: 8020
-          protocol: TCP
-        - containerPort: 8025
-          protocol: TCP
-        - containerPort: 50070
-          protocol: TCP
-        - containerPort: 50075
-          protocol: TCP
-        - containerPort: 50010
-          protocol: TCP
-        - containerPort: 50020
-          protocol: TCP
-        - containerPort: 3888
-          protocol: TCP
-        - containerPort: 2888
-          protocol: TCP
-        - containerPort: 2181
-          protocol: TCP
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-        - mountPath: /opt/tools
-          name: dcae-cdap1-opt-tools
-        - mountPath: /opt/data
-          name: dcae-cdap1-opt-data
-      volumes:
-      - name: cdap-root
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap
-      - name: dcae-cdap1-opt-tools
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-tools
-      - name: dcae-cdap1-opt-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap1-opt-data
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml
deleted file mode 100644
index fac825e227..0000000000
--- a/kubernetes/dcae/templates/cdap2-dep.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeCdap }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "1"
-  labels:
-    app: cdap2
-  name: cdap2
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: cdap2
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: cdap2
-      name: cdap2
-    spec:
-      initContainers:
-      - command: ["/bin/bash", "-c", "mkdir -p /cdap/{cdap2-opt-tools,cdap2-opt-data}; grep `hostname` /etc/hosts > /cdap/pod-ip/`hostname`_ip.txt; while [`ls /cdap/pod-ip | wc -l` < 3];  do sleep 1; done"]
-        name: create-fs
-        image: {{ .Values.image.cdapfs }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-      hostname: zldcprivatecloudtruecdap02
-      containers:
-      - image: {{ .Values.image.cdap }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        command: ["/bin/bash"]
-        args: ["-c", "cat /cdap/pod-ip/* >> /etc/hosts; /usr/local/bin/01-entrypoint.sh; sleep infinity;"]
-        name: cdap2
-        ports:
-        - containerPort: 8020
-          protocol: TCP
-        - containerPort: 8025
-          protocol: TCP
-        - containerPort: 50070
-          protocol: TCP
-        - containerPort: 50075
-          protocol: TCP
-        - containerPort: 50010
-          protocol: TCP
-        - containerPort: 50020
-          protocol: TCP
-        - containerPort: 3888
-          protocol: TCP
-        - containerPort: 2888
-          protocol: TCP
-        - containerPort: 2181
-          protocol: TCP
-        volumeMounts:
-        - mountPath: /cdap
-          name: cdap-root
-        - mountPath: /opt/tools
-          name: dcae-cdap2-opt-tools
-        - mountPath: /opt/data
-          name: dcae-cdap2-opt-data
-      volumes:
-      - name: cdap-root
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap
-      - name: dcae-cdap2-opt-tools
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-tools
-      - name: dcae-cdap2-opt-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap2-opt-data
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml
deleted file mode 100644
index b15d34bad0..0000000000
--- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeDcaeCollectorCommonEvent }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: dcae-collector-common-event
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: dcae-collector-common-event
-  template:
-    metadata:
-      labels:
-        app: dcae-collector-common-event
-      name: dcae-collector-common-event
-    spec:
-      containers:
-      - image: {{ .Values.image.commonevent }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: dcae-collector-common-event
-        ports:
-          - containerPort: 8080
-          - containerPort: 8443
-          - containerPort: 9999
-        env:
-#        - name: KAFKA_ZOOKEEPER_CONNECT
-#          value: "zookeeper:2181"
-#        command:
-#        - start-kafka.sh
-        volumeMounts:
-        - mountPath: /opt/app/manager/config
-          name: dcae-collector-common-event-config
-      restartPolicy: Always
-      volumes:
-      - name: dcae-collector-common-event-config
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
deleted file mode 100644
index 35e913e1bb..0000000000
--- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeDcaeCollectorDmaapbc }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: dcae-collector-dmaapbc
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: dcae-collector-dmaapbc
-  template:
-    metadata:
-      labels:
-        app: dcae-collector-dmaapbc
-      name: dcae-collector-dmaapbc
-    spec:
-      containers:
-      - image: {{ .Values.image.dmaapbc }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: dcae-collector-dmaapbc
-        ports:
-          - containerPort: 18080
-          - containerPort: 18443
-        env:
-#        - name: KAFKA_ZOOKEEPER_CONNECT
-#          value: "zookeeper:2181"
-#        command:
-#        - start-kafka.sh
-        volumeMounts:
-        - mountPath: /opt/app/config
-          name: dcae-collector-dmaapbc-config
-      restartPolicy: Always
-      volumes:
-      - name: dcae-collector-dmaapbc-config
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml
deleted file mode 100644
index b7a0e13b88..0000000000
--- a/kubernetes/dcae/templates/dcae-controller.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeDcaeController }}
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: dcae-controller
-    version: latest
-  name: dcae-controller
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  ports:
-  - name: dcae-con1
-    port: 8000
-    protocol: TCP
-    targetPort: 8000
-    nodePort: {{ .Values.nodePortPrefix }}34
-  - name: dcae-con2
-    port: 9998
-    protocol: TCP
-    targetPort: 9998
-    nodePort: {{ .Values.nodePortPrefix }}35
-  selector:
-    app: dcae-controller
-  type: NodePort
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: dcae-controller
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: dcae-controller
-  template:
-    metadata:
-      labels:
-        app: dcae-controller
-      name: dcae-controller
-    spec:
-      containers:
-      - image: {{ .Values.image.controller }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: dcae-controller
-        ports:
-          - containerPort: 8000
-          - containerPort: 9998
-        env:
-#        - name: KAFKA_ZOOKEEPER_CONNECT
-#          value: "zookeeper:2181"
-#        command:
-#        - start-kafka.sh
-        volumeMounts:
-        - mountPath: /opt/app/config
-          name: dcae-controller-config
-      restartPolicy: Always
-      volumes:
-      - name: dcae-controller-config
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml
deleted file mode 100644
index 560da5f604..0000000000
--- a/kubernetes/dcae/templates/dcae-dmaap.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeDmaap }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: dmaap
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: dmaap
-  template:
-    metadata:
-      labels:
-        app: dmaap
-      name: dmaap
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - kafka
-        - --container-name
-        - zookeeper
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: dmaap-readiness
-      containers:
-      - image: {{ .Values.image.dmaap }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: dmaap
-        ports:
-        - containerPort: 3904
-        - containerPort: 3905
-        readinessProbe:
-          tcpSocket:
-            port: 3904
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        volumeMounts:
-        - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
-          name: appprops
-        - mountPath: /appl/dmaapMR1/etc/cadi.properties
-          name: cadi
-        - mountPath: /appl/dmaapMR1/etc/keyfile
-          name: mykey
-      restartPolicy: Always
-      volumes:
-      - name: appprops
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/MsgRtrApi.properties
-      - name: cadi
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/cadi.properties
-      - name: mykey
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dmaap/mykey
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml
deleted file mode 100644
index 52d0503983..0000000000
--- a/kubernetes/dcae/templates/dcae-kafka.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeKafka }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: kafka
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: kafka
-  template:
-    metadata:
-      labels:
-        app: kafka
-      name: kafka
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - zookeeper
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: kafka-readiness
-      containers:
-      - image: {{ .Values.image.kafka }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: kafka
-        ports:
-        - containerPort: 9092
-        readinessProbe:
-          tcpSocket:
-            port: 9092
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        env:
-        - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "zookeeper.{{ .Values.nsPrefix }}"
-        - name: KAFKA_ADVERTISED_HOST_NAME
-          value: "kafka"
-        - name: KAFKA_BROKER_ID
-          value: "1"
-        - name: KAFKA_ADVERTISED_PORT
-          value: "9092"
-        - name: KAFKA_PORT
-          value: "9092"
-        volumeMounts:
-        - mountPath: /var/run/docker.sock
-          name: docker-socket
-        - mountPath: /kafka
-          name: kafka-data
-        - mountPath: /start-kafka.sh
-          name: start-kafka
-      restartPolicy: Always
-      volumes:
-      - name: docker-socket
-        hostPath:
-          path: /var/run/docker.sock
-      - name: kafka-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
-      - name: start-kafka
-        hostPath:
-          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 }}
diff --git a/kubernetes/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml
deleted file mode 100644
index 7203cb92db..0000000000
--- a/kubernetes/dcae/templates/dcae-zookeeper.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeZookeeper }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: zookeeper
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: zookeeper
-  template:
-    metadata:
-      labels:
-        app: zookeeper
-      name: zookeeper
-    spec:
-      containers:
-      - image: {{ .Values.image.zookeeper }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: zookeeper
-        ports:
-        - containerPort: 2181
-        volumeMounts:
-        - mountPath: /opt/zookeeper-3.4.9/data
-          name: zookeeper-data
-      restartPolicy: Always
-      volumes:
-      - name: zookeeper-data
-        hostPath:
-          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 }}
diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml
deleted file mode 100644
index 61aa93dcb2..0000000000
--- a/kubernetes/dcae/templates/pgaas.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableDcaeDcaePgaas }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "1"
-  labels:
-    app: dcae-pgaas
-  name: dcae-pgaas
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: dcae-pgaas
-  template:
-    metadata:
-      labels:
-        app: dcae-pgaas
-    spec:
-      hostname: zldciad4vipstg00
-      containers:
-      - image: {{ .Values.image.pgaas }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        command: ["/bin/bash"]
-        args: ["-c", "/usr/local/bin/entrypoint.sh; sleep infinity;"]
-        name: dcae-pgaas
-        ports:
-        - containerPort: 5432
-        volumeMounts:
-        - mountPath: /dbroot/pgdata
-          name: dcae-pgaas-pgdata
-        - mountPath: /dbroot/pglogs
-          name: dcae-pgaas-pglogs
-        - mountPath: /opt/tools
-          name: dcae-pgaas-tools
-      volumes:
-      - name: dcae-pgaas-pgdata
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/pgdata
-      - name: dcae-pgaas-pglogs
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/pglogs
-      - name: dcae-pgaas-tools
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}