From a1cda614dc945f44a19aefbe74f2d0a5660e5304 Mon Sep 17 00:00:00 2001
From: Pat Christopher <coffeepac@gmail.com>
Date: Tue, 25 Jun 2019 14:37:02 -0700
Subject: [PATCH 1/2] move images from gcr.io to quay.io

---
 cluster/addons/fluentd-elasticsearch/README.md           | 7 ++-----
 cluster/addons/fluentd-elasticsearch/es-image/Makefile   | 9 ++++++---
 .../fluentd-elasticsearch/fluentd-es-image/Makefile      | 9 ++++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/README.md b/cluster/addons/fluentd-elasticsearch/README.md
index 7e58dd3d7ef..8a9ce013152 100644
--- a/cluster/addons/fluentd-elasticsearch/README.md
+++ b/cluster/addons/fluentd-elasticsearch/README.md
@@ -56,11 +56,8 @@ Learn more in the [official Kubernetes documentation][k8sElasticsearchDocs].
 
 ## Building
 
-Both images are now being hosted in google cloud and are built via the
-[cloud build](https://cloud.google.com/cloud-build/) product.  To build these
-images yourself you will need to have the [gcloud sdk](https://cloud.google.com/sdk/install)
-installed and you will need to login.  You can then run `make` in either
-image directory to trigger a container build.
+Both images are now being hosted in quay.io and are built locally via `make` and `docker`.
+To build locally run `make build` and then `make push` to publish.  
 
 ### Known problems
 
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
index 8f5dbab5b4e..b32d928a134 100755
--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -12,11 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY:	build
+.PHONY:	build push
 
-PREFIX = gcr.io/fluentd-elasticsearch
+PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = elasticsearch
 TAG = v6.7.2
 
 build:
-	gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG}
+	docker build  --tag ${PREFIX}/${IMAGE}:${TAG} .
+
+push:
+    docker push ${PREFIX}/${IMAGE}:${TAG}
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index 62d89dbd30f..0c939311c8d 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -12,11 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY:	build
+.PHONY:	build push
 
-PREFIX = gcr.io/fluentd-elasticsearch
+PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = fluentd
 TAG = v2.5.2
 
 build:
-	gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)
+	docker build  --tag ${PREFIX}/${IMAGE}:${TAG} .
+
+push:
+	docker push ${PREFIX}/${IMAGE}:${TAG}
\ No newline at end of file

From 8c819a2dc16ba8616b717c53cdd4401d9b039780 Mon Sep 17 00:00:00 2001
From: Pat Christopher <coffeepac@gmail.com>
Date: Wed, 26 Jun 2019 12:11:00 -0700
Subject: [PATCH 2/2] add defaul latest tag as well

---
 cluster/addons/fluentd-elasticsearch/es-image/Makefile        | 1 +
 .../addons/fluentd-elasticsearch/fluentd-es-image/Makefile    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
index b32d928a134..3696fc745ed 100755
--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -23,3 +23,4 @@ build:
 
 push:
     docker push ${PREFIX}/${IMAGE}:${TAG}
+	docker push ${PREFIX}/${IMAGE}:latest
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index 0c939311c8d..f4a8a7bbbf2 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -22,4 +22,6 @@ build:
 	docker build  --tag ${PREFIX}/${IMAGE}:${TAG} .
 
 push:
-	docker push ${PREFIX}/${IMAGE}:${TAG}
\ No newline at end of file
+	docker push ${PREFIX}/${IMAGE}:${TAG}
+	docker push ${PREFIX}/${IMAGE}:latest
+	
\ No newline at end of file