Merge pull request kubernetes#11439 from jfchevrette/source-local-clu…

…ster-env Allow a local /cluster/env.sh to be sourced if present
lavalamp · Sep 3, 2015 · 04600aa · 04600aa
2 parents c9f2d31 + 91a05c0
commit 04600aa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,9 @@ Session.vim
 .vagrant
 network_closure.sh
 
+# Local cluster env variables
+/cluster/env.sh
+
 # Compiled binaries in third_party
 /third_party/pkg
 

diff --git a/cluster/kube-down.sh b/cluster/kube-down.sh
@@ -21,6 +21,11 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+
+if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
+    source "${KUBE_ROOT}/cluster/env.sh"
+fi
+
 source "${KUBE_ROOT}/cluster/kube-env.sh"
 source "${KUBE_ROOT}/cluster/kube-util.sh"
 

diff --git a/cluster/kube-push.sh b/cluster/kube-push.sh
@@ -24,6 +24,11 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+
+if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
+    source "${KUBE_ROOT}/cluster/env.sh"
+fi
+
 source "${KUBE_ROOT}/cluster/kube-env.sh"
 source "${KUBE_ROOT}/cluster/kube-util.sh"
 

diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh
@@ -25,6 +25,11 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+
+if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
+    source "${KUBE_ROOT}/cluster/env.sh"
+fi
+
 source "${KUBE_ROOT}/cluster/kube-env.sh"
 source "${KUBE_ROOT}/cluster/kube-util.sh"