From 81eeeec894ce0cdda446d63adbf31b4a320f0173 Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Tue, 22 Nov 2016 12:03:46 +0100
Subject: [PATCH] Bump fluentd-es image version

---
 .../addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 7 ++++---
 cluster/saltbase/salt/fluentd-es/fluentd-es.yaml           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index c646d151997..257a2cfbe70 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -14,11 +14,12 @@
 
 .PHONY:	build push
 
+PREFIX = gcr.io/google_containers
 IMAGE = fluentd-elasticsearch
-TAG = 1.19
+TAG = 1.20
 
 build:
-	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
+	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push:
-	gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)
+	gcloud docker --server=gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
index 9e7913a54c5..495da5c1bec 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.19
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.20
     resources:
       limits:
         memory: 200Mi