Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanups to the live update example #4559

Merged
merged 2 commits into from
Feb 19, 2015
Merged

Cleanups to the live update example #4559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d83973
Replace KUBE_REPO_ROOT with KUBE_ROOT to be consistent with usage els…
roberthbailey Feb 18, 2015
972c926
Removed the --zone argument when creating firewalls since it is not a…
roberthbailey Feb 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/update-demo/1-run-web-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions examples/update-demo/2-create-replication-controller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
4 changes: 2 additions & 2 deletions examples/update-demo/3-scale.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/update-demo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down