diff options
Diffstat (limited to 'kubernetes/log/templates/kibana-deployment.yaml')
| -rw-r--r-- | kubernetes/log/templates/kibana-deployment.yaml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml index 459ecfee09..2de825e516 100644 --- a/kubernetes/log/templates/kibana-deployment.yaml +++ b/kubernetes/log/templates/kibana-deployment.yaml @@ -15,33 +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 @@ 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 }} |