One namespace leftover fixes

Change-Id: Id44e74db3a26f963957222ba6690f6d57e0378db
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash
index 52748bc933..9833af7909 100755
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -7,12 +7,11 @@ delete_namespace() {
 }
 
 delete_service_account() {
-    kubectl delete clusterrolebinding $1-$2-admin-binding
-    printf "Service account $1-$2-admin-binding deleted.\n\n"
+    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() {
@@ -134,13 +133,14 @@ printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
 
 for i in ${HELM_APPS[@]}; do
   delete_app_helm $NS $i
-  delete_service_account $NS $i
 done
 
 if [ "$SINGLE_COMPONENT" == "false" ]
 then
     delete_app_helm $NS "config"
     delete_namespace $NS
+    delete_registry_key $NS
+    delete_service_account $NS
 fi
 
 if $WAIT_TERMINATE; then