Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add additional clean targets
[icn.git]
/
deploy
/
site
/
vm
/
vm.sh
diff --git
a/deploy/site/vm/vm.sh
b/deploy/site/vm/vm.sh
index
bfe591b
..
51ad4c9
100644
(file)
--- a/
deploy/site/vm/vm.sh
+++ b/
deploy/site/vm/vm.sh
@@
-70,6
+70,10
@@
function insert_control_plane_network_identity_into_ssh_config {
# This enables logging into the control plane machines from this
# machine without specifying the identify file on the command line
# This enables logging into the control plane machines from this
# machine without specifying the identify file on the command line
+ if [[ ! $(which ipcalc) ]]; then
+ apt-get install -y ipcalc
+ fi
+
# Create ssh config if it doesn't exist
mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh
touch ${HOME}/.ssh/config
# Create ssh config if it doesn't exist
mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh
touch ${HOME}/.ssh/config
@@
-103,11
+107,22
@@
function wait_for_all_ready {
insert_control_plane_network_identity_into_ssh_config
}
insert_control_plane_network_identity_into_ssh_config
}
+function is_cluster_deleted {
+ ! kubectl -n ${SITE_NAMESPACE} get cluster icn
+}
+
+function wait_for_all_deleted {
+ WAIT_FOR_INTERVAL=60s
+ WAIT_FOR_TRIES=30
+ wait_for is_cluster_deleted
+}
+
case $1 in
"build-source") build_source ;;
"clean") clean ;;
"deploy") deploy ;;
"wait") wait_for_all_ready ;;
case $1 in
"build-source") build_source ;;
"clean") clean ;;
"deploy") deploy ;;
"wait") wait_for_all_ready ;;
+ "wait-clean") wait_for_all_deleted ;;
*) cat <<EOF
Usage: $(basename $0) COMMAND
*) cat <<EOF
Usage: $(basename $0) COMMAND