github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46596 from st4nson/fluentd_plugin_update

Browse Source 
Automatic merge from submit-queue

Update 'fluentd-elasticsearch' image.

**What this PR does / why we need it**:

Plugins updated for `fluentd-elasticsearch`:
 - fluent-plugin-elasticsearch 1.5.0 -> 1.9.5
 - fluent-plugin-kubernetes_metadata 0.24.0 -> 0.27.0

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-30 20:41:52 -07:00 committed by GitHub
commit 1b3e95d0c3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -23,7 +23,7 @@ spec:
spec: spec:
containers: containers:
- name: fluentd-es - name: fluentd-es
image: gcr.io/google_containers/fluentd-elasticsearch:1.22 image: gcr.io/google_containers/fluentd-elasticsearch:1.23
command: command:
- '/bin/sh' - '/bin/sh'
- '-c' - '-c'

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.22 TAG = 1.23
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

4
cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
View File

@ -30,8 +30,8 @@ sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/in
# Install the Elasticsearch Fluentd plug-in. # Install the Elasticsearch Fluentd plug-in.
# http://docs.fluentd.org/articles/plugin-management # http://docs.fluentd.org/articles/plugin-management
td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.24.0 td-agent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.27.0
td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.5.0 td-agent-gem install --no-document fluent-plugin-elasticsearch -v 1.9.5
# Remove docs and postgres references # Remove docs and postgres references
rm -rf /opt/td-agent/embedded/share/doc \ rm -rf /opt/td-agent/embedded/share/doc \