From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 15 Dec 2017 15:44:33 +0000 (+0000)
Subject: Merge "Update annotations to spec for aaf"
X-Git-Tag: 2.0.0-ONAP~537
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8db8b1825e199e295a2429c450d6cc9f5825c2e1;hp=d3dff5689023e6ce18b8b5cdc865ff04df572a29;p=oom.git

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

diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 56c99ea37f..6664f18886 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -15,33 +15,22 @@ spec:
       labels:
         app: aaf
       name: aaf
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "aaf-cs"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "aaf-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - aaf-cs
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: aaf-readiness
       containers:
       - env:
         - name: CASSANDRA_CLUSTER
@@ -63,4 +52,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }}
\ No newline at end of file
+#{{ end }}