From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 15 Dec 2017 14:48:14 +0000 (+0000)
Subject: Merge "Update annotations to spec for vid"
X-Git-Tag: 2.0.0-ONAP~544
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8643a044fec4540ee03ca4c8729f17c6e430fc6a;hp=5ac02a0410e9959c15f3ec0640bd120a31695966;p=oom.git

Merge "Update annotations to spec for vid"
---

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 5354dbac77..832fdeb93c 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -15,33 +15,22 @@ spec:
       labels:
         app: vid-server
       name: vid-server
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "vid-mariadb"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "vid-server-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - vid-mariadb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: vid-server-readiness
       containers:
       - env:
         - name: ASDC_CLIENT_REST_HOST