X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmessage-router%2Ftemplates%2Fmessage-router-dmaap.yaml;h=cecf69b86f222d397ca17107141b0ab139879209;hb=2e00737960d2131070d809c2b81d48382020c189;hp=1cc79c819e34a430dd2d070f9c7ab2ecec3e3b72;hpb=1f11885db780da4b4fcfe91d5456d1235a0e9dd8;p=oom.git

diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index 1cc79c819e..cecf69b86f 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disableMessageRouterDmaap }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: dmaap
   namespace: "{{ .Values.nsPrefix }}-message-router"
 spec:
+  replicas: {{ .Values.dmaapReplicas }}
   selector:
     matchLabels:
       app: dmaap
@@ -12,35 +14,24 @@ spec:
       labels:
         app: dmaap
       name: dmaap
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "global-kafka",
-                  "--container-name",
-                  "zookeeper"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "dmaap-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - global-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 }}
@@ -79,3 +70,4 @@ spec:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+{{ end }}