moving certs and keys to k8s secrets

[oom.git] / kubernetes / oneclick / deleteAll.bash

diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash
index dfa75b5..f7c48fd 100755 (executable)
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -5,19 +5,26 @@
 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 "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_registry_key() {
-  kubectl --namespace $1-$2 delete secret onap-docker-registry-key
+  kubectl --namespace $1-$2 delete secret ${1}-docker-registry-key
 }
 
+delete_certs_secret() {
+  if [ -d $LOCATION/config/certs/$i/ ]; then
+    kubectl delete secret secret-$1-$2 -n $1-$2
+  fi
+}
+
+
 delete_app_helm() {
-  helm delete $1 --purge
+  helm delete $1-$2 --purge
 }
 
 usage() {
@@ -36,8 +43,9 @@ EOF
 NS=
 INCL_SVC=false
 APP=
+LOCATION="../"
 
-while getopts ":n:u:s:a:" PARAM; do
+while getopts ":n:u:s:a:l:" PARAM; do
   case $PARAM in
     u)
       usage
@@ -53,6 +61,9 @@ while getopts ":n:u:s:a:" PARAM; do
         exit 1
       fi
       ;;
+    l)
+      LOCATION=${OPTARG}
+      ;;
     ?)
       usage
       exit
@@ -74,7 +85,8 @@ printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
 
 for i in ${HELM_APPS[@]}; do
 
-  delete_app_helm $i
+  delete_certs_secret $NS $i
+  delete_app_helm $NS $i
   delete_namespace $NS $i
 
 done