Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

demo: move mesh delete command into the cleanup script #1831

Merged
merged 1 commit into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions demo/clean-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ set -aueo pipefail
# shellcheck disable=SC1091
source .env

bin/osm mesh uninstall -f --mesh-name "$MESH_NAME" --namespace "$K8S_NAMESPACE"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a make build-osm before running the uninstall command?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could but unnecessary in the context of current usage (always invoked via demo script). Is it ok to assume the cleanup script for the demo is run post install, at which time the cli binary is built already? I don't see value in even running this without the demo being run prior.


for ns in "$BOOKWAREHOUSE_NAMESPACE" "$BOOKBUYER_NAMESPACE" "$BOOKSTORE_NAMESPACE" "$BOOKTHIEF_NAMESPACE" "$K8S_NAMESPACE"; do
kubectl delete namespace "$ns" --ignore-not-found --wait &
done
Expand Down
1 change: 0 additions & 1 deletion demo/run-osm-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ docker info > /dev/null || { echo "Docker daemon is not running"; exit 1; }
make build-osm

# cleanup stale resources from previous runs
bin/osm mesh uninstall -f --mesh-name "$MESH_NAME" --namespace "$K8S_NAMESPACE"
./demo/clean-kubernetes.sh

# The demo uses osm's namespace as defined by environment variables, K8S_NAMESPACE
Expand Down