Merge "Update annotations to spec for mso"

diff --combined kubernetes/mso/templates/mso-deployment.yaml
index b9ee3c7,8722cd6..2abb290
--- 1/kubernetes/mso/templates/mso-deployment.yaml
--- 2/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@@ -14,33 -14,22 +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
@@@ -65,8 -54,6 +54,8 @@@
            name: logback-tenant
          - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vnf.xml
            name: logback-vnf
 +        - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vfc.xml
 +          name: logback-vfc
          - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-appc-adapter-config/logback.appc.xml
            name: logback-appc
          - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-requests-db-adapter-config/logback.msorequestsdbadapter.xml
@@@ -77,8 -64,6 +66,8 @@@
            name: logback-sdnc
          - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-bpmn-config/logback.bpmn.xml
            name: logback-bpmn
 +        - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-workflow-message-adapter-config/logback.workflow-message-adapter.xml
 +          name: logback-workflow-message-adapter
          env:
          - name: JBOSS_DEBUG
            value: "false"
@@@ -119,9 -104,6 +108,9 @@@
          - name: logback-vnf
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vnf.xml
 +        - name: logback-vfc
 +          hostPath:
 +            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vfc.xml
          - name: logback-appc
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.appc.xml
@@@ -137,9 -119,6 +126,9 @@@
          - name: logback-bpmn
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.bpmn.xml
 +        - name: logback-workflow-message-adapter
 +          hostPath:
 +            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.workflow-message-adapter.xml
          - name: mso
            hostPath:
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
@@@ -155,4 -134,4 +144,4 @@@
              path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
        imagePullSecrets:
        - name: "{{ .Values.nsPrefix }}-docker-registry-key"
- #{{ end }}
+ #{{ end }}