Merge pull request #57813 from david-mcmahon/honor-outdir

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Honor make variable OUT_DIR in hyperkube Makefile Needed to ensure the split of `make cross-in-a-container` and `make package-tarballs` honors the use of `OUT_DIR`. In the new and upcoming containerized (GCB) release builds, multiple `cross-in-a-container` targets are run into their own `_output ($OUT_DIR)` directories and a second pass runs multiple `package-tarballs`. This won't work unless we honor `$OUT_DIR` here. See also #23839 cc @javier-b-perez

Merge pull request #57813 from david-mcmahon/honor-outdir
dea36b9b · Kubernetes Submit Queue · GitHub · f9e4b6d0 · d65005bd · dea36b9b
Unverified Commit dea36b9b authored Jan 04, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Makefile cluster/images/hyperkube/Makefile +2 -1

No files found.
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -19,7 +19,8 @@

 REGISTRY?=gcr.io/google-containers
 ARCH?=amd64
-HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
+OUT_DIR?=_output
+HYPERKUBE_BIN?=$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube

 BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.8
 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)