From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Wed, 25 Oct 2017 19:59:11 +0000 (+0000)
Subject: Merge "No-wait namespace deletion option in deleteAll"
X-Git-Tag: 2.0.0-ONAP~597
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=017d2ed22a0775d1c9637a355e050bf51108a9ed;hp=-c;p=oom.git

Merge "No-wait namespace deletion option in deleteAll"
---

017d2ed22a0775d1c9637a355e050bf51108a9ed
diff --combined kubernetes/oneclick/deleteAll.bash
index 2d5779ea2a,cdc651b1a9..cf293e48ad
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@@ -5,11 -5,6 +5,6 @@@
  delete_namespace() {
    _NS=$1-$2
    kubectl delete namespace $_NS
-    printf "Waiting for namespace $_NS termination...\n"
-    while kubectl get namespaces $_NS > /dev/null 2>&1; do
-      sleep 2
-    done
-   printf "Namespace $_NS deleted.\n\n"
  }
  
  delete_service_account() {
@@@ -25,6 -20,24 +20,24 @@@ delete_app_helm() 
    helm delete $1-$2 --purge
  }
  
+ wait_terminate() {
+   printf "Waiting for namespaces termination...\n"
+   while true; do
+     declare -i _STATUS=0
+     for i in ${HELM_APPS[@]}; do
+       kubectl get namespaces $1-$i > /dev/null 2>&1
+       if [ "$?" -eq "0" ]; then
+         _STATUS=1
+         break
+       fi
+     done
+     if [ "$_STATUS" -eq "0" ]; then
+       break
+     fi
+     sleep 2
+   done
+ }
+ 
  usage() {
    cat <<EOF
  Usage: $0 [PARAMs]
@@@ -32,8 -45,9 +45,9 @@@
  -n [NAMESPACE]      : Kubernetes namespace (required)
  -a [APP]            : Specify a specific ONAP component (default: all)
                        from the following choices:
 -                      sdc, aai ,mso, message-router, robot, vid, aaf
 +                      sdc, aai ,mso, message-router, robot, vid, aaf, uui
                        sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
+ -N                  : Do not wait for deletion of namespace and its objects
  EOF
  }
  
@@@ -41,8 -55,9 +55,9 @@@
  NS=
  INCL_SVC=false
  APP=
+ WAIT_TERMINATE=true
  
- while getopts ":n:u:s:a:" PARAM; do
+ while getopts ":n:u:s:a:N" PARAM; do
    case $PARAM in
      u)
        usage
@@@ -58,6 -73,9 +73,9 @@@
          exit 1
        fi
        ;;
+     N)
+       WAIT_TERMINATE=false
+       ;;
      ?)
        usage
        exit
@@@ -85,5 -103,8 +103,8 @@@ for i in ${HELM_APPS[@]}; d
  
  done
  
+ if $WAIT_TERMINATE; then
+   wait_terminate $NS
+ fi
  
  printf "\n********** Gone **********\n"