Run all components in one namespace

[oom.git] / kubernetes / dcae / templates / cdap0-dep.yaml

diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml
index d438ab9..208e1ef 100644 (file)
--- 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:
@@ -6,7 +7,7 @@ metadata:
   labels:
     app: cdap0
   name: cdap0
-  namespace: "{{ .Values.nsPrefix }}-dcae"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -21,22 +22,15 @@ spec:
       labels:
         app: cdap0
       name: cdap0
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "name": "create-fs",
-              "image": "{{ .Values.image.cdapfs }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "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"],
-              "volumeMounts": [
-                {
-                  "mountPath": "/cdap",
-                  "name": "cdap-root"
-                }
-              ]
-          }
-        ]'
     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 }}
@@ -82,3 +76,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/cdap/cdap0-opt-data
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}