X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foneclick%2FdeleteAll.bash;h=9833af790979499760f09777b56b4ffd8ba61531;hb=efce48f73d3162f7705980c549968c799aee936f;hp=f3b8da723853acb0899d68bf3bb3bbf4da3c3b27;hpb=7e46c63029117817ffba478e871777ea0dd17514;p=oom.git diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index f3b8da7238..9833af7909 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -3,32 +3,56 @@ . $(dirname "$0")/setenv.bash 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" + kubectl delete namespace $1 +} + +delete_service_account() { + kubectl delete clusterrolebinding $1-admin-binding } delete_registry_key() { - kubectl --namespace $1-$2 delete secret ${1}-docker-registry-key + kubectl --namespace $1 delete secret ${1}-docker-registry-key } 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 pods --namespace $1 | grep -w " $i" > /dev/null 2>&1 + if [ "$?" -ne "0" ]; then + _STATUS=1 + break + fi + done + + if [ "$SINGLE_COMPONENT" == "false" ]; then + kubectl get namespaces $1 > /dev/null 2>&1 + _STATUS=$? + fi + if [ "$_STATUS" -ne "0" ]; then + break + fi + sleep 2 + done +} + usage() { cat <