From d25e36a7e9fa44ecaa93f86bdb85f6873938219b Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Tue, 14 Feb 2017 10:06:15 +0100 Subject: [PATCH] Bumped gcl plugin in fluentd-gcp --- cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile | 4 ++-- cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile | 2 +- cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml | 2 +- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile index 203cc45288cd..dd1d544c40b6 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile @@ -20,7 +20,7 @@ # scope and that the Logging API has been enabled for the project # in the Google Developer Console. -FROM gcr.io/google_containers/ubuntu-slim:0.4 +FROM gcr.io/google_containers/ubuntu-slim:0.6 MAINTAINER Mik Vyatskov "vmik@google.com" @@ -36,7 +36,7 @@ RUN apt-get -qq update && \ sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent && \ td-agent-gem install --no-document fluent-plugin-record-reformer -v 0.8.2 && \ td-agent-gem install --no-document fluent-plugin-systemd -v 0.0.5 && \ - td-agent-gem install --no-document fluent-plugin-google-cloud -v 0.5.2 && \ + td-agent-gem install --no-document fluent-plugin-google-cloud -v 0.5.6 && \ # Remove build tools apt-get remove -y -qq gcc make && \ apt-get autoremove -y -qq && \ diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index 420a27ffe2f0..6604fbdeb8fe 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile @@ -29,7 +29,7 @@ .PHONY: build push PREFIX=gcr.io/google_containers -TAG = 1.28 +TAG = 1.28.2 build: docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) . diff --git a/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml b/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml index 22175d89c17a..0e19ce89b00c 100644 --- a/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml +++ b/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml @@ -11,7 +11,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.28.1 + image: gcr.io/google_containers/fluentd-gcp:1.28.2 command: - '/bin/sh' - '-c' diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 15ef516c6927..2271627c6af4 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -11,7 +11,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.28.1 + image: gcr.io/google_containers/fluentd-gcp:1.28.2 resources: limits: memory: 200Mi