diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2017-12-15 14:39:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-12-15 14:39:07 +0000 |
| commit | 15502e6e3e82028e25c74b23091665c3bfba8f0c (patch) | |
| tree | 5f61af516cc5116c34baefebeebb224472508b21 /kubernetes/log/templates/logstash-deployment.yaml | |
| parent | 27137ce690267e49d0b2b53b882c6a860ab0619c (diff) | |
| parent | 7a3182133295f8e0e8587e3b6ee3b9211072e5f2 (diff) | |
Merge "Update annotations to spec for log"
Diffstat (limited to 'kubernetes/log/templates/logstash-deployment.yaml')
| -rw-r--r-- | kubernetes/log/templates/logstash-deployment.yaml | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml index d25793e178..47c72c8145 100644 --- a/kubernetes/log/templates/logstash-deployment.yaml +++ b/kubernetes/log/templates/logstash-deployment.yaml @@ -15,34 +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 }} |