X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foneclick%2FdeleteAll.bash;h=53f1d1a9cbccc6bc9202d24bff43a751e28e4db3;hb=85091152dd3a572f1ef33c73ff07446af1b97a57;hp=8f44f125d55eb611739092e06345bea948fc5d12;hpb=f776f3d5fa1a660bee24057e65625b62eedf382c;p=oom.git diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index 8f44f125d5..53f1d1a9cb 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -5,11 +5,11 @@ 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() { + kubectl delete clusterrolebinding $1-$2-admin-binding + printf "Service account $1-$2-admin-binding deleted.\n\n" } delete_registry_key() { @@ -20,15 +20,36 @@ 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 <