Merge pull request #11786 from a-robinson/fluentd

Update fluentd-gcp images to include latest Dockerfile changes
2015-07-24 12:40:41 -07:00
parent 39a7fc3706 0889307522
commit 01349cdbfa
6 changed files with 6 additions and 6 deletions
--- 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.

--- 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