commit 3561e0168723ad1850765e116f52b11048b9bc12
author kiranya <kiran.yadav@amdocs.com> Wed Nov 22 13:45:35 2017 +0000
committer kiranya <kiran.yadav@amdocs.com> Wed Nov 22 13:46:30 2017 +0000
tree 4d7fe7d603ee10d32034ac035c357b779c9671a8
parent 1cee1a3eb985815da8d55ca7bcfa2bf3ac092d34

Update annotations to spec for message-router

Issue-ID: OOM-406

Change-Id: Icd94a6194a80df6866e72996d242ae5b3599fc33
Signed-off-by: kiranya <kiran.yadav@amdocs.com>

kubernetes/message-router/templates/message-router-kafka.yaml

diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml
index 3e2628b..ab12c28 100644
--- a/kubernetes/message-router/templates/message-router-kafka.yaml
+++ b/kubernetes/message-router/templates/message-router-kafka.yaml
@@ -13,33 +13,22 @@
       labels:
         app: global-kafka
       name: global-kafka
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--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": "kafka-readiness"
-          }
-          ]'
     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 }}
@@ -88,4 +77,4 @@
           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
+#{{ end }}