diff options
Diffstat (limited to 'kubernetes/log')
| -rw-r--r-- | kubernetes/log/templates/elasticsearch-deployment.yaml | 39 | ||||
| -rw-r--r-- | kubernetes/log/templates/kibana-deployment.yaml | 41 | ||||
| -rw-r--r-- | kubernetes/log/templates/logstash-deployment.yaml | 42 |
3 files changed, 46 insertions, 76 deletions
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml index c123df1daa..74ab921834 100644 --- a/kubernetes/log/templates/elasticsearch-deployment.yaml +++ b/kubernetes/log/templates/elasticsearch-deployment.yaml @@ -15,30 +15,23 @@ spec: labels: app: elasticsearch name: elasticsearch - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "command": ["sysctl", "-w", "vm.max_map_count=262144"], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "securityContext": { - "privileged": true - }, - "image": "{{ .Values.image.es_bb }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "init-sysctl" - } - ]' spec: + initContainers: + - command: + - sysctl + - -w + - vm.max_map_count=262144 + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + securityContext: + privileged: true + image: {{ .Values.image.es_bb }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: init-sysctl containers: - name: elasticsearch image: {{ .Values.image.elasticsearch}} diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml index e48cbb4ac4..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 }} 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 }} |