From 9d8397383583e1a56f0956f7d6417d55a805064e Mon Sep 17 00:00:00 2001
From: Robert Bailey <robertbailey@google.com>
Date: Wed, 18 Feb 2015 14:36:36 -0800
Subject: [PATCH 1/2] Replace KUBE_REPO_ROOT with KUBE_ROOT to be consistent
 with usage elsewhere in the repository.

---
 examples/update-demo/1-run-web-proxy.sh                 | 2 +-
 examples/update-demo/2-create-replication-controller.sh | 6 +++---
 examples/update-demo/3-scale.sh                         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/update-demo/1-run-web-proxy.sh b/examples/update-demo/1-run-web-proxy.sh
index d92ab8ba485..c6f45a85ab7 100755
--- a/examples/update-demo/1-run-web-proxy.sh
+++ b/examples/update-demo/1-run-web-proxy.sh
@@ -25,7 +25,7 @@ echo "    http://localhost:8001/static/"
 echo
 
 export KUBE_ROOT=$(dirname $0)/../..
-export KUBECTL=${KUBE_REPO_ROOT}/cluster/kubectl.sh
+export KUBECTL=${KUBE_ROOT}/cluster/kubectl.sh
 
 set -x
 
diff --git a/examples/update-demo/2-create-replication-controller.sh b/examples/update-demo/2-create-replication-controller.sh
index e70379899d1..1f9c0d01ac4 100755
--- a/examples/update-demo/2-create-replication-controller.sh
+++ b/examples/update-demo/2-create-replication-controller.sh
@@ -23,11 +23,11 @@ if [[ "${DOCKER_HUB_USER+set}" != "set" ]] ; then
   exit 1
 fi
 
-export KUBE_REPO_ROOT=${KUBE_REPO_ROOT-$(dirname $0)/../..}
-export KUBECTL=${KUBE_REPO_ROOT}/cluster/kubectl.sh
+export KUBE_ROOT=${KUBE_ROOT-$(dirname $0)/../..}
+export KUBECTL=${KUBE_ROOT}/cluster/kubectl.sh
 
 set -x
 
-SCHEMA=${KUBE_REPO_ROOT}/examples/update-demo/nautilus-rc.yaml
+SCHEMA=${KUBE_ROOT}/examples/update-demo/nautilus-rc.yaml
 
 cat ${SCHEMA} | sed "s/DOCKER_HUB_USER/${DOCKER_HUB_USER}/" | ${KUBECTL} create -f -
diff --git a/examples/update-demo/3-scale.sh b/examples/update-demo/3-scale.sh
index 6c2aa65e65b..4123d362e38 100755
--- a/examples/update-demo/3-scale.sh
+++ b/examples/update-demo/3-scale.sh
@@ -20,8 +20,8 @@ set -o pipefail
 
 NEW_SIZE=${1:-4}
 
-export KUBE_REPO_ROOT=${KUBE_REPO_ROOT-$(dirname $0)/../..}
-export KUBECTL=${KUBECTL-$KUBE_REPO_ROOT/cluster/kubectl.sh}
+export KUBE_ROOT=${KUBE_ROOT-$(dirname $0)/../..}
+export KUBECTL=${KUBECTL-$KUBE_ROOT/cluster/kubectl.sh}
 
 set -x
 

From 972c9262cb68d38980a239430bf0b63c72189dd5 Mon Sep 17 00:00:00 2001
From: Robert Bailey <robertbailey@google.com>
Date: Wed, 18 Feb 2015 14:37:08 -0800
Subject: [PATCH 2/2] Removed the --zone argument when creating firewalls since
 it is not a valid argument.

See https://cloud.google.com/sdk/gcloud/reference/compute/firewall-rules/create
---
 examples/update-demo/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/update-demo/README.md b/examples/update-demo/README.md
index a3607113160..24d15051867 100644
--- a/examples/update-demo/README.md
+++ b/examples/update-demo/README.md
@@ -38,7 +38,7 @@ You may need to open the firewall for port 8080 using the [console][cloud-consol
 ```bash
 $ gcloud compute firewall-rules create \
   --allow tcp:8080 --target-tags=kubernetes-minion \
-  --zone=us-central1-a kubernetes-minion-8080
+  kubernetes-minion-8080
 ```
 
 ### Step Zero: Build the Docker images