Merge pull request #34958 from euank/local-up-guess-path

Automatic merge from submit-queue local-up: Add option to guess binary path This adds a `-O` flag which guesses the right output directory. The reason for having two flags, not one, is because bash's `getopt` doesn't let you do optional arguments easily, so having both makes the code simpler. I also removed the redundant empty check; the bash argument check meant that was never hit. cc @jayunit100 and @jbeda (arbitrary people from the git log)

Merge pull request #34958 from euank/local-up-guess-path
19e9f7e4 · Kubernetes Submit Queue · GitHub · c301ac9c · 973b417a · 19e9f7e4
Commit 19e9f7e4 authored Oct 17, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 5 deletions

running-locally.md docs/devel/running-locally.md +6 -0

local-up-cluster.sh hack/local-up-cluster.sh +19 -5

No files found.
--- a/docs/devel/running-locally.md
+++ b/docs/devel/running-locally.md
@@ -102,6 +102,12 @@ hack/local-up-cluster.sh
 This will build and start a lightweight local cluster, consisting of a master
 and a single node. Type Control-C to shut it down.

+If you've already compiled the Kubernetes components, then you can avoid rebuilding them with this script by using the `-O` flag.
+
+```sh
+./hack/local-up-cluster.sh -O
+```
+
 You can use the cluster/kubectl.sh script to interact with the local cluster. hack/local-up-cluster.sh will
 print the commands to run to point kubectl at the local cluster.


--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -71,21 +71,35 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 function usage {
            echo "This script starts a local kube cluster. "
            echo "Example 1: hack/local-up-cluster.sh -o _output/dockerized/bin/linux/amd64/ (run from docker output)"
-            echo "Example 2: hack/local-up-cluster.sh (build a local copy of the source)"
+            echo "Example 2: hack/local-up-cluster.sh -O (auto-guess the bin path for your platform)"
+            echo "Example 3: hack/local-up-cluster.sh (build a local copy of the source)"
+}
+
+# This function guesses where the existing cached binary build is for the `-O`
+# flag
+function guess_built_binary_path {
+  local hyperkube_path=$(kube::util::find-binary "hyperkube")
+  if [[ -z "${hyperkube_path}" ]]; then
+    return
+  fi
+  echo -n "$(dirname "${hyperkube_path}")"
 }

 ### Allow user to supply the source directory.
 GO_OUT=""
-while getopts "o:" OPTION
+while getopts "o:O" OPTION
 do
    case $OPTION in
        o)
            echo "skipping build"
-            echo "using source $OPTARG"
            GO_OUT="$OPTARG"
+            echo "using source $GO_OUT"
+            ;;
+        O)
+            GO_OUT=$(guess_built_binary_path)
            if [ $GO_OUT == "" ]; then
-                echo "You provided an invalid value for the build output directory."
-                exit
+                echo "Could not guess the correct output directory to use."
+                exit 1
            fi
            ;;
        ?)