Merge "Update annotations to spec for log"

diff --combined kubernetes/log/templates/kibana-deployment.yaml
index e48cbb4,57e8415..2de825e
--- 1/kubernetes/log/templates/kibana-deployment.yaml
--- 2/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@@ -15,33 -15,22 +15,22 @@@ spec
        labels:
          app: kibana
        name: kibana
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "elasticsearch"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "kibana-readiness"
-           }
-           ]'
      spec:
+       initContainers:
+       - command:
+         - /root/ready.py
+         args:
+         - --container-name
+         - elasticsearch
+         env:
+         - name: NAMESPACE
+           valueFrom:
+             fieldRef:
+               apiVersion: v1
+               fieldPath: metadata.namespace
+         image: {{ .Values.image.readiness }}
+         imagePullPolicy: {{ .Values.pullPolicy }}
+         name: kibana-readiness
        containers:
        - name: kibana
          image: {{ .Values.image.kibana }}
@@@ -69,5 -58,5 +58,5 @@@ metadata
    name: kibana-configmap
    namespace: {{ .Values.nsPrefix }}-log
  data:
 -{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }}
 +{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
  #{{ end }}

diff --combined kubernetes/log/templates/logstash-deployment.yaml
index d25793e,b4732da..47c72c8
--- 1/kubernetes/log/templates/logstash-deployment.yaml
--- 2/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@@ -15,34 -15,22 +15,22 @@@ spec
        labels:
          app: logstash
        name: logstash
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "elasticsearch"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "logstash-readiness"
-           }
-           ]'
- 
      spec:
+       initContainers:
+       - command:
+         - /root/ready.py
+         args:
+         - --container-name
+         - elasticsearch
+         env:
+         - name: NAMESPACE
+           valueFrom:
+             fieldRef:
+               apiVersion: v1
+               fieldPath: metadata.namespace
+         image: {{ .Values.image.readiness }}
+         imagePullPolicy: {{ .Values.pullPolicy }}
+         name: logstash-readiness
        containers:
        - name: logstash
          image: {{ .Values.image.logstash }}
@@@ -80,5 -68,5 +68,5 @@@ metadata
    namespace: {{ .Values.nsPrefix }}-log
  data:
  {{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
 -{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }}
 +{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
  #{{ end }}