Standardize how we refer to the kubernetes root.

Now use $KUBE_ROOT as the variable pretty much everywhere.
This commit is contained in:
Joe Beda
2014-10-03 14:58:49 -07:00
parent 38d5906044
commit d43a6ec5a3
42 changed files with 172 additions and 156 deletions

View File

@@ -20,8 +20,8 @@
# Exit on error
set -e
source "${KUBE_REPO_ROOT}/cluster/kube-env.sh"
source "${KUBE_REPO_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
# Launch a container
$KUBECFG -p 8080:80 run dockerfile/nginx 2 myNginx

View File

@@ -20,10 +20,10 @@
set -e
source "${KUBE_REPO_ROOT}/cluster/kube-env.sh"
source "${KUBE_REPO_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
GUESTBOOK="${KUBE_REPO_ROOT}/examples/guestbook"
GUESTBOOK="${KUBE_ROOT}/examples/guestbook"
# Launch the guestbook example
$KUBECFG -c "${GUESTBOOK}/redis-master.json" create /pods

View File

@@ -20,8 +20,8 @@ set -o errexit
set -o nounset
set -o pipefail
source "${KUBE_REPO_ROOT}/cluster/kube-env.sh"
source "${KUBE_REPO_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
CONTROLLER_NAME=update-demo
@@ -79,26 +79,26 @@ function validate() {
export DOCKER_HUB_USER=jbeda
# Launch a container
${KUBE_REPO_ROOT}/examples/update-demo/2-create-replication-controller.sh
${KUBE_ROOT}/examples/update-demo/2-create-replication-controller.sh
function teardown() {
echo "Cleaning up test artifacts"
${KUBE_REPO_ROOT}/examples/update-demo/5-down.sh
${KUBE_ROOT}/examples/update-demo/5-down.sh
}
trap "teardown" EXIT
validate 2 nautilus
${KUBE_REPO_ROOT}/examples/update-demo/3-scale.sh 1
${KUBE_ROOT}/examples/update-demo/3-scale.sh 1
sleep 2
validate 1 nautilus
${KUBE_REPO_ROOT}/examples/update-demo/3-scale.sh 2
${KUBE_ROOT}/examples/update-demo/3-scale.sh 2
sleep 2
validate 2 nautilus
${KUBE_REPO_ROOT}/examples/update-demo/4-rolling-update.sh kitten 1s
${KUBE_ROOT}/examples/update-demo/4-rolling-update.sh kitten 1s
sleep 2
validate 2 kitten