diff --git a/demo/clean-kubernetes.sh b/demo/clean-kubernetes.sh index 09c3e1b921..b972a12ab3 100755 --- a/demo/clean-kubernetes.sh +++ b/demo/clean-kubernetes.sh @@ -5,6 +5,8 @@ set -aueo pipefail # shellcheck disable=SC1091 source .env +bin/osm mesh uninstall -f --mesh-name "$MESH_NAME" --namespace "$K8S_NAMESPACE" + for ns in "$BOOKWAREHOUSE_NAMESPACE" "$BOOKBUYER_NAMESPACE" "$BOOKSTORE_NAMESPACE" "$BOOKTHIEF_NAMESPACE" "$K8S_NAMESPACE"; do kubectl delete namespace "$ns" --ignore-not-found --wait & done diff --git a/demo/run-osm-demo.sh b/demo/run-osm-demo.sh index 31edefa5a9..36d700d027 100755 --- a/demo/run-osm-demo.sh +++ b/demo/run-osm-demo.sh @@ -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