openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluentd: Change default image"

Browse Source
This commit is contained in:
Zuul 2018-08-22 16:47:30 +00:00 committed by Gerrit Code Review
commit 2bbf188cbd
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluent-logging/templates/bin/_fluentd.sh.tpl
View File

@ -20,7 +20,7 @@ set -ex
COMMAND="${@:-start}" COMMAND="${@:-start}"
function start () { function start () {
exec /usr/sbin/td-agent exec fluentd -c /fluentd/etc/fluent.conf
} }
function stop () { function stop () {

2
fluent-logging/templates/configmap-etc.yaml
View File

@ -26,7 +26,7 @@ data:
{{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }} {{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }}
parsers.conf: | parsers.conf: |
{{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.parsers | indent 4 }} {{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.parsers | indent 4 }}
td-agent.conf: | fluent.conf: |
{{ include "fluent_logging.utils.to_fluentd_conf" .Values.conf.td_agent | indent 4 }} {{ include "fluent_logging.utils.to_fluentd_conf" .Values.conf.td_agent | indent 4 }}
{{ range $template, $fields := .Values.conf.templates }} {{ range $template, $fields := .Values.conf.templates }}
{{ $template }}.json: | {{ $template }}.json: |

6
fluent-logging/templates/deployment-fluentd.yaml
View File

@ -136,10 +136,10 @@ spec:
key: ELASTICSEARCH_PASSWORD key: ELASTICSEARCH_PASSWORD
volumeMounts: volumeMounts:
- name: pod-etc-fluentd - name: pod-etc-fluentd
mountPath: /etc/td-agent mountPath: /fluentd/etc
- name: fluent-logging-etc - name: fluent-logging-etc
mountPath: /etc/td-agent/td-agent.conf mountPath: /fluentd/etc/fluent.conf
subPath: td-agent.conf subPath: fluent.conf
readOnly: true readOnly: true
- name: fluent-logging-bin - name: fluent-logging-bin
mountPath: /tmp/fluentd.sh mountPath: /tmp/fluentd.sh

2
fluent-logging/values.yaml
View File

@ -37,7 +37,7 @@ labels:
images: images:
tags: tags:
fluentbit: docker.io/fluent/fluent-bit:0.12.14 fluentbit: docker.io/fluent/fluent-bit:0.12.14
fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3