Merge "Update annotations to spec for appc"

diff --combined kubernetes/appc/templates/dgbuilder-deployment.yaml
index 32ccdaf,ea6dc78..ed69c05
--- 1/kubernetes/appc/templates/dgbuilder-deployment.yaml
--- 2/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@@ -13,35 -13,24 +13,24 @@@ spec
        labels:
          app: appc-dgbuilder
        name: appc-dgbuilder
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "appc-db-container",
-                   "--container-name",
-                   "appc-controller-container"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "appc-dgbuilder-readiness"
-           }
-           ]'
      spec:
+       initContainers:
+       - command:
+         - /root/ready.py
+         args:
+         - --container-name
+         - appc-db-container
+         - --container-name
+         - appc-controller-container
+         env:
+         - name: NAMESPACE
+           valueFrom:
+             fieldRef:
+               apiVersion: v1
+               fieldPath: metadata.namespace
+         image: {{ .Values.image.readiness }}
+         imagePullPolicy: {{ .Values.pullPolicy }}
+         name: appc-dgbuilder-readiness
        containers:
        - command:
          - /bin/bash
@@@ -51,7 -40,9 +40,7 @@@
          - name: MYSQL_ROOT_PASSWORD
            value: openECOMP1.0
          - name: SDNC_CONFIG_DIR
 -          value: /opt/openecomp/sdnc/data/properties
 -        - name: APPC_CONFIG_DIR
 -          value: /opt/openecomp/appc/data/properties
 +          value: /opt/onap/sdnc/data/properties
          image: {{ .Values.image.dgbuilderSdnc }}
          imagePullPolicy: {{ .Values.pullPolicy }}
          name: appc-dgbuilder-container
@@@ -73,4 -64,4 +62,4 @@@
        restartPolicy: Always
        imagePullSecrets:
        - name: "{{ .Values.nsPrefix }}-docker-registry-key"
- #{{ end }}
+ #{{ end }}