X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fpod11%2Fpod11.sh;h=856e2497af8f54e21e40a91fc7b909891b224d6b;hb=41776ab3743c491e4ff4c31e7a2ea48abe6451a2;hp=7c052ffbfc9b9479d93a93c8e99f04aa5c9d00ff;hpb=b0c23b54b074a501aabbea30a876e6e3211e7cc7;p=icn.git

diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index 7c052ff..856e249 100755
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -12,15 +12,10 @@ mkdir -p ${BUILDDIR}
 
 SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
 SITE_BRANCH=${SITE_BRANCH:-"master"}
-SITE_PATH=${SITE_PATH:-"deploy/site/pod11"}
-
-FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
-
-function build_source {
-    sops_encrypt ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
-}
+SITE_PATH=${SITE_PATH:-"deploy/site/pod11/deployment"}
 
 function deploy {
+    # TODO Replace ICN test key with real key
     flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
 }
 
@@ -49,16 +44,25 @@ function wait_for_all_ready {
     wait_for is_control_plane_ready
 }
 
+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 ;;
+    "wait-clean") wait_for_all_deleted ;;
     *) cat <<EOF
 Usage: $(basename $0) COMMAND
 
 Commands:
-  build-source  - Rebuild the in-tree site files
   clean         - Remove the site
   deploy        - Deploy the site
   wait          - Wait for the site to be ready