From 32842b4d22efaa4342c824fbb8697bfd926b1f8d Mon Sep 17 00:00:00 2001 From: Satnam Singh Date: Tue, 19 May 2015 15:51:08 -0700 Subject: [PATCH] Update Fluentd GCP image --- cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile | 3 +++ cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile | 2 +- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile index 1eaf961ce36..ba8c402a817 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile @@ -17,6 +17,9 @@ RUN apt-get -q update && \ apt-get clean && \ curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash +# Update gem for fluent-plugin-google-cloud +RUN /usr/sbin/google-fluentd-gem update fluent-plugin-google-cloud + # Copy the Fluentd configuration file for logging Docker container logs. COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index adf5c5585c5..c197be84b23 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile @@ -6,7 +6,7 @@ .PHONY: build push -TAG = 1.5 +TAG = 1.6 build: docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) . diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 43cdfc94ae9..60342afbf13 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.5 + image: gcr.io/google_containers/fluentd-gcp:1.6 env: - name: "FLUENTD_ARGS" value: "-qq"