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 8d145f9..f7c48fd 100755 (executable)
--- a/kubernetes/oneclick/deleteAll.bash
+++ b/kubernetes/oneclick/deleteAll.bash
@@ -1,10 +1,30 @@
 #!/bin/bash
+
+. $(dirname "$0")/setenv.bash
+
 delete_namespace() {
-  kubectl delete namespace $1-$2
+  _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_registry_key() {
+  kubectl --namespace $1-$2 delete secret ${1}-docker-registry-key
 }
 
-delete_service() {
-  kubectl --namespace $1-$2 delete -f ../$2/all-services.yaml
+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-$2 --purge
 }
 
 usage() {
@@ -12,7 +32,6 @@ usage() {
 Usage: $0 [PARAMs]
 -u                  : Display usage
 -n [NAMESPACE]      : Kubernetes namespace (required)
--s true             : Include services (default: false)
 -a [APP]            : Specify a specific ONAP component (default: all)
                       from the following choices:
                       sdc, aai ,mso, message-router, robot,
@@ -24,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
@@ -34,9 +54,6 @@ while getopts ":n:u:s:a:" PARAM; do
     n)
       NS=${OPTARG}
       ;;
-    s)
-      INCL_SVC=${OPTARG}
-      ;;
     a)
       APP=${OPTARG}
       if [[ -z $APP ]]; then
@@ -44,6 +61,9 @@ while getopts ":n:u:s:a:" PARAM; do
         exit 1
       fi
       ;;
+    l)
+      LOCATION=${OPTARG}
+      ;;
     ?)
       usage
       exit
@@ -57,23 +77,17 @@ if [[ -z $NS ]]; then
 fi
 
 if [[ ! -z "$APP" ]]; then
-  ONAP_APPS=($APP)
-else
-  ONAP_APPS=('sdc' 'aai' 'mso' 'message-router' 'robot' 'vid' 'sdnc' 'portal' 'policy' 'appc')
+  HELM_APPS=($APP)
 fi
 
 printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
 
-for i in ${ONAP_APPS[@]}; do
 
-  if [[ "$INCL_SVC" == true ]]; then
-    printf "\nDeleting services **********\n"
-    delete_service $NS $i
-    delete_namespace $NS $i
-  fi
+for i in ${HELM_APPS[@]}; do
 
-  # delete the deployments
-  /bin/bash $i.sh $NS $i 'delete'
+  delete_certs_secret $NS $i
+  delete_app_helm $NS $i
+  delete_namespace $NS $i
 
 done