From db9951b2ce2029a08d2dd6ed79661477393676eb Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Wed, 18 Jan 2017 13:21:08 -0500
Subject: [PATCH] Change kubemark Makefile to be provider independent

The Kubemark Makefile is defaulted to gcr.io. Instead, make it
provider independent.
---
 cluster/images/kubemark/Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/cluster/images/kubemark/Makefile b/cluster/images/kubemark/Makefile
index 48a684d7b1f..6786aeea245 100644
--- a/cluster/images/kubemark/Makefile
+++ b/cluster/images/kubemark/Makefile
@@ -15,8 +15,18 @@
 # build Kubemark image from currently built binaries containing both 'real' master and Hollow Node.
 # This makefile assumes that the kubemark binary is present in this directory.
 
-all:
-	docker build --pull -t gcr.io/$(PROJECT)/kubemark .
-	gcloud docker -- push gcr.io/$(PROJECT)/kubemark
+REGISTRY?=gcr.io
+PROJECT?=google_containers
 
-.PHONY: all
+all: gcloudpush
+
+build:
+	docker build --pull -t $(REGISTRY)/$(PROJECT)/kubemark .
+
+gcloudpush: build
+	gcloud docker -- push $(REGISTRY)/$(PROJECT)/kubemark
+
+push: build
+	docker -- push $(REGISTRY)/$(PROJECT)/kubemark
+
+.PHONY: all build gcloudpush push