Merge "Update annotations to spec for vid"

diff --combined kubernetes/vid/templates/vid-server-deployment.yaml
index 5354dba,b97b27a..832fdeb
--- 1/kubernetes/vid/templates/vid-server-deployment.yaml
--- 2/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@@ -15,33 -15,22 +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
@@@ -59,7 -48,7 +48,7 @@@
          - name: VID_MSO_SERVER_URL
            value: http://mso.{{ .Values.nsPrefix }}-mso:8080
          - name: VID_MSO_PASS
 -          value: 51515201a8d4c5c08d533db9bd1e1a9b
 +          value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
          - name: MSO_DME2_SERVER_URL
            value: http://localhost:8081
          - name: MSO_DME2_ENABLED