From 4ba97e39680e188d3aa2c4ea0f3b667cc8bed43d Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 5 Sep 2014 13:13:53 -0400
Subject: [PATCH 1/2] Move default target list from build_go to config_go

---
 hack/build-go.sh  | 9 +--------
 hack/config-go.sh | 9 +++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hack/build-go.sh b/hack/build-go.sh
index 72560428d17..a011ed852bf 100755
--- a/hack/build-go.sh
+++ b/hack/build-go.sh
@@ -48,14 +48,7 @@ for arg; do
 done
 
 if [[ ${#targets[@]} -eq 0 ]]; then
-  targets=(
-    cmd/proxy
-    cmd/apiserver
-    cmd/controller-manager
-    cmd/kubelet
-    cmd/kubecfg
-    plugin/cmd/scheduler
-  )
+  targets=($(kube::default_build_targets))
 fi
 
 binaries=()
diff --git a/hack/config-go.sh b/hack/config-go.sh
index 84147132d6d..9d92b53e90f 100644
--- a/hack/config-go.sh
+++ b/hack/config-go.sh
@@ -114,6 +114,15 @@ kube::setup_go_environment() {
 }
 
 
+# kube::default_build_targets return list of all build targets
+kube::default_build_targets() {
+  echo "cmd/proxy"
+  echo "cmd/apiserver"
+  echo "cmd/controller-manager"
+  echo "cmd/kubelet"
+  echo "cmd/kubecfg"
+  echo "plugin/cmd/scheduler"
+}
 # --- Environment Variables ---
 
 # KUBE_REPO_ROOT  - Path to the top of the build tree.

From e426dd78a14eb72ac6a5b68b6d12b2923ddd11f4 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 5 Sep 2014 13:38:05 -0400
Subject: [PATCH 2/2] function to turn list of targets to list of go packages

---
 hack/build-go.sh  | 5 +----
 hack/config-go.sh | 9 +++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hack/build-go.sh b/hack/build-go.sh
index a011ed852bf..d3800fc4a26 100755
--- a/hack/build-go.sh
+++ b/hack/build-go.sh
@@ -51,10 +51,7 @@ if [[ ${#targets[@]} -eq 0 ]]; then
   targets=($(kube::default_build_targets))
 fi
 
-binaries=()
-for target in ${targets[@]}; do
-  binaries+=("${KUBE_GO_PACKAGE}/${target}")
-done
+binaries=($(kube::binaries_from_targets "${targets[@]}"))
 
 echo "Building local go components"
 # Note that the flags to 'go build' are duplicated in the salt build setup
diff --git a/hack/config-go.sh b/hack/config-go.sh
index 9d92b53e90f..d49b8a0688e 100644
--- a/hack/config-go.sh
+++ b/hack/config-go.sh
@@ -123,6 +123,15 @@ kube::default_build_targets() {
   echo "cmd/kubecfg"
   echo "plugin/cmd/scheduler"
 }
+
+# kube::binaries_from_targets take a list of build targets and return the
+# full go package to be built
+kube::binaries_from_targets() {
+  local target
+  for target; do
+    echo "${KUBE_GO_PACKAGE}/${target}"
+  done
+}
 # --- Environment Variables ---
 
 # KUBE_REPO_ROOT  - Path to the top of the build tree.