From 08893075225dc41c7467ea850788c8ea025d8a47 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Fri, 24 Jul 2015 01:27:42 +0000 Subject: [PATCH] Update the fluentd-gcp images to include their latest Dockerfile changes. Their Dockerfiles were changed in #11768. --- cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile | 2 +- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +- contrib/logging/fluentd-sidecar-gcp/Makefile | 2 +- contrib/logging/fluentd-sidecar-gcp/README.md | 2 +- .../logging/fluentd-sidecar-gcp/logging-sidecar-example.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile index d0ba196a67b..fae3f59ff7e 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile @@ -15,7 +15,7 @@ .PHONY: kbuild kpush -TAG = 1.8 +TAG = 1.9 # Rules for building the test image for deployment to Dockerhub with user kubernetes. diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 7a658f896b5..6ea7adb2047 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -6,7 +6,7 @@ metadata: spec: containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.8 + image: gcr.io/google_containers/fluentd-gcp:1.9 resources: limits: cpu: 100m diff --git a/contrib/logging/fluentd-sidecar-gcp/Makefile b/contrib/logging/fluentd-sidecar-gcp/Makefile index 7b70e96e20b..ed720da45b6 100644 --- a/contrib/logging/fluentd-sidecar-gcp/Makefile +++ b/contrib/logging/fluentd-sidecar-gcp/Makefile @@ -1,6 +1,6 @@ .PHONY: build push -TAG = 1.2 +TAG = 1.3 build: docker build -t gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG) . diff --git a/contrib/logging/fluentd-sidecar-gcp/README.md b/contrib/logging/fluentd-sidecar-gcp/README.md index 88dfbc6f0e0..89548e7d827 100644 --- a/contrib/logging/fluentd-sidecar-gcp/README.md +++ b/contrib/logging/fluentd-sidecar-gcp/README.md @@ -9,7 +9,7 @@ This shouldn't be necessary if your container writes its logs to stdout or stder In order to make this work, you have to add a few things to your pod config: -1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-gcp:1.2` image to send the logs to Google Cloud Logging. We recommend attaching resource constraints of `100m` CPU and `200Mi` memory to this container, as in the example. +1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-gcp:1.3` image to send the logs to Google Cloud Logging. We recommend attaching resource constraints of `100m` CPU and `200Mi` memory to this container, as in the example. 2. A volume for the two containers to share. The emptyDir volume type is a good choice for this because we only want the volume to exist for the lifetime of the pod. 3. Mount paths for the volume in each container. In your primary container, this should be the path that the applications log files are written to. In the secondary container, this can be just about anything, so we put it under /mnt/log to keep it out of the way of the rest of the filesystem. 4. The `FILES_TO_COLLECT` environment variable in the sidecar container, telling it which files to collect logs from. These paths should always be in the mounted volume. diff --git a/contrib/logging/fluentd-sidecar-gcp/logging-sidecar-example.yaml b/contrib/logging/fluentd-sidecar-gcp/logging-sidecar-example.yaml index a722f719d15..ba8e060de50 100644 --- a/contrib/logging/fluentd-sidecar-gcp/logging-sidecar-example.yaml +++ b/contrib/logging/fluentd-sidecar-gcp/logging-sidecar-example.yaml @@ -13,7 +13,7 @@ spec: - name: log-storage mountPath: /var/log - name: sidecar-log-collector - image: gcr.io/google_containers/fluentd-sidecar-gcp:1.2 + image: gcr.io/google_containers/fluentd-sidecar-gcp:1.3 resources: limits: cpu: 100m