vendor updates

vendor/k8s.io/kubernetes/cluster/images/kubemark/BUILD

@@ -12,10 +12,10 @@ docker_build(
 docker_push(
     name = "push",
     image = ":image",
-    registry = "gcr.io",
-    repository = "$(PROJECT)/kubemark",
+    registry = "$(REGISTRY)",
+    repository = "kubemark",
     stamp = True,
-    tag = "latest",
+    tag = "$(IMAGE_TAG)",
     tags = ["manual"],
 )
 

vendor/k8s.io/kubernetes/cluster/images/kubemark/Makefile

@@ -15,18 +15,22 @@
 # 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.
 
-REGISTRY?=gcr.io
-PROJECT?=google_containers
+# Allow the caller to override this.  Beware make's precedence. This:
+#   REGISTRY=$VAR make
+# .. is not the same as:
+#   make REGISTRY=$VAR
+REGISTRY := $(if $(REGISTRY),$(REGISTRY),staging-k8s.gcr.io)
+IMAGE_TAG := $(if $(IMAGE_TAG),$(IMAGE_TAG),latest)
 
 all: gcloudpush
 
 build:
-	docker build --pull -t $(REGISTRY)/$(PROJECT)/kubemark .
+	docker build --pull -t $(REGISTRY)/kubemark:$(IMAGE_TAG) .
 
 gcloudpush: build
-	gcloud docker -- push $(REGISTRY)/$(PROJECT)/kubemark
+	docker push $(REGISTRY)/kubemark:$(IMAGE_TAG)
 
 push: build
-	docker -- push $(REGISTRY)/$(PROJECT)/kubemark
+	docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG)
 
 .PHONY: all build gcloudpush push

vendor/k8s.io/kubernetes/cluster/images/kubemark/OWNERS

@@ -1,6 +1,8 @@
 reviewers:
   - gmarek
+  - shyamjvs
   - wojtek-t
 approvers:
   - gmarek
+  - shyamjvs
   - wojtek-t