From 09f7b38e7d240d2f7703063c667c0b1d188879fa Mon Sep 17 00:00:00 2001
From: kiranya <kiran.yadav@amdocs.com>
Date: Mon, 13 Nov 2017 07:46:53 +0000
Subject: [PATCH] Update annotations to spec for mso

Issue-ID: OOM-406

Change-Id: If55e42dbfc80c60f6b4b7bf11f1648ad7b65928b
Signed-off-by: kiranya <kiran.yadav@amdocs.com>
---
 kubernetes/mso/templates/mso-deployment.yaml | 43 +++++++++++-----------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index a33d9b08fa..8722cd6557 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -14,33 +14,22 @@ spec:
       labels:
         app: mso
       name: mso
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "mariadb"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "mso-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - mariadb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: mso-readiness
       containers:
       - command:
         - /tmp/start-jboss-server.sh
@@ -145,4 +134,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
-- 
2.16.6