update cleanup.sh

Author: Lily He

kubernetes/delete-weblogic-domain-resources.sh

@@ -53,47 +53,6 @@ cat << EOF
 EOF
 }
 
-#
-# get voyager related resources of one domain
-#
-# Usage:
-#   getVoyagerOfDomain domainName outfilename
-function getVoyagerOfDomain {
-  local voyagerIngressName="ingress.voyager.appscode.com"
-  local domainName=$1
-  local ns=`kubectl get ingress.voyager.appscode.com --all-namespaces | grep $domainName | awk '{ print $1 }'`
-  if [ -n "$ns" ]; then
-    echo $voyagerIngressName $domainName-voyager -n $ns >> $2
-  fi
-}
-
-#
-# get voyager related resources
-#
-# Usage:
-#   getVoyagerRes domainA,domainB,... outfilename
-#   getVoyagerRes all outfilename
-function getVoyagerRes {
-  if [ "$1" = "all" ]; then
-    resList=`kubectl get ingress.voyager.appscode.com --all-namespaces | awk '{print $2}'`
-    for resName in $resList
-    do
-      if [ $resName != 'NAME' ]; then
-        tail="-voyager"
-        len=${#resName}-${#tail}
-        domainName=${resName:0:len}
-        getVoyagerOfDomain $domainName $2
-      fi
-    done
-  else
-    IFS=',' read -r -a array <<< "$1"
-    for domainName in "${array[@]}"
-    do
-      getVoyagerOfDomain $domainName $2
-    done
-  fi
-}
-
 #
 # getDomainResources domain(s) outfilename
 #
@@ -129,6 +88,11 @@ function getDomainResources {
     NAMESPACED_TYPES="domain,$NAMESPACED_TYPES"
   fi
 
+  VOYAGER_ING_NAME="ingresses.voyager.appscode.com"
+  if [ `kubectl get crd $VOYAGER_ING_NAME |grep $VOYAGER_ING_NAME | wc -l` = 1 ]; then
+    NAMESPACED_TYPES="$VOYAGER_ING_NAME,$NAMESPACED_TYPES"
+  fi
+
   kubectl get $NAMESPACED_TYPES \
           -l "$LABEL_SELECTOR" \
           -o=jsonpath='{range .items[*]}{.kind}{" "}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
@@ -142,9 +106,6 @@ function getDomainResources {
           -l "$LABEL_SELECTOR" \
           -o=jsonpath='{range .items[*]}{.kind}{" "}{.metadata.name}{"\n"}{end}' \
           --all-namespaces=true >> $2
-
-  # get all voyager-related resources
-  getVoyagerRes $1 $2
 }
 
 #
@@ -243,9 +204,9 @@ function deleteDomains {
     # for each namespace with leftover resources, try delete them
     cat $tempfile | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do 
       if [ "$test_mode" = "true" ]; then
-        echo kubectl -n $line delete $NAMESPACED_TYPES,ingress.voyager.appscode.com  -l "$LABEL_SELECTOR" 
+        echo kubectl -n $line delete $NAMESPACED_TYPES  -l "$LABEL_SELECTOR"
       else
-        kubectl -n $line delete $NAMESPACED_TYPES,ingress.voyager.appscode.com -l "$LABEL_SELECTOR" 
+        kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
       fi
     done
 
@@ -307,3 +268,4 @@ if [ ! -x "$(command -v kubectl)" ]; then
 fi
 
 deleteDomains "${domains}" "${maxwaitsecs:-$default_maxwaitsecs}"
+

src/integration-tests/bash/cleanup.sh

@@ -78,6 +78,7 @@ function getResWithLabel {
 # deleteResWithLabel outputfile
 #
 function deleteResWithLabel {
+  echo @@ Delete resources with label $LABEL_SELECTOR.
   # clean the output file first
   if [ -e $1 ]; then
     rm $1
@@ -86,43 +87,51 @@ function deleteResWithLabel {
   getResWithLabel $1
   # delete namespaced types
   cat $1 | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do
-    if [ "$test_mode" = "true" ]; then
-      echo kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
-    else
-      kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
-    fi
+    kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
   done
 
   # delete non-namespaced types
   local no_namespace_count=`grep -c -v " -n " $1`
   if [ ! "$no_namespace_count" = "0" ]; then
-    if [ "$test_mode" = "true" ]; then
-      echo kubectl delete $NOT_NAMESPACED_TYPES -l "$LABEL_SELECTOR"
+    kubectl delete $NOT_NAMESPACED_TYPES -l "$LABEL_SELECTOR"
+  fi
+
+  echo "@@ Waiting for pods to stop running."
+  local total=0
+  for count in {1..100}; do
+    pods=($(kubectl get pods --all-namespaces -l weblogic.domainUID -o jsonpath='{range .items[*]}{.metadata.name} {end}'))
+    total=${#pods[*]}
+    if [ $total -eq 0 ] ; then
+        break
     else
-      kubectl delete $NOT_NAMESPACED_TYPES -l "$LABEL_SELECTOR"
+      echo "@@ There are still $total running pods with label $LABEL_SELECTOR."
     fi
-  fi
-}
+    sleep 3
+  done
 
-#
-# deleteWLSOperators
-#
-function deleteWLSOperators {
-  local tempfile="/tmp/$(basename $0).tmp.$$"  # == /tmp/[script-file-name].tmp.[pid]
-  # delete wls operator resources
-  LABEL_SELECTOR="weblogic.operatorName"
-  #getResWithLabel $tempfile
-  deleteResWithLabel $tempfile
+  if [ $total -gt 0 ]; then
+    echo "Warning: after waiting 300 seconds, there are still $total running pods with label $LABEL_SELECTOR."
+  fi
 }
 
-#
-# deleteVoyagerController
-#
 function deleteVoyagerController {
+
   curl -fsSL https://raw.githubusercontent.com/appscode/voyager/6.0.0/hack/deploy/voyager.sh \
       | bash -s -- --provider=baremetal --namespace=voyager --uninstall --purge
+  kubectl delete namespace voyager
 }
 
+#
+# deleteNamespaces outputfile
+#
+function deleteNamespaces {
+  cat $1 | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do
+    if [ "$line" != "default" ]; then
+      kubectl delete namespace $line --ignore-not-found
+    fi
+  done
+
+}
 echo @@ Starting cleanup.
 script="${BASH_SOURCE[0]}"
 scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
@@ -132,16 +141,37 @@ echo "@@ RESULT_ROOT=$RESULT_ROOT TMP_DIR=$TMP_DIR RESULT_DIR=$RESULT_DIR PROJEC
 mkdir -p $TMP_DIR || fail No permision to create directory $TMP_DIR
 
 NAMESPACED_TYPES="pod,job,deploy,rs,service,pvc,ingress,cm,serviceaccount,role,rolebinding,secret"
+
+HANDLE_VOYAGER="false"
+VOYAGER_ING_NAME="ingresses.voyager.appscode.com"
+if [ `kubectl get crd $VOYAGER_ING_NAME --ignore-not-found | grep $VOYAGER_ING_NAME | wc -l` = 1 ]; then
+  NAMESPACED_TYPES="$VOYAGER_ING_NAME,$NAMESPACED_TYPES"
+  HANDLE_VOYAGER="true"
+fi
+
+DOMAIN_CRD="domains.weblogic.oracle"
+if [ `kubectl get crd $DOMAIN_CRD --ignore-not-found | grep $DOMAIN_CRD | wc -l` = 1 ]; then
+  NAMESPACED_TYPES="$DOMAIN_CRD,$NAMESPACED_TYPES"
+fi
+
 NOT_NAMESPACED_TYPES="pv,crd,clusterroles,clusterrolebindings"
 
-# Delele domain resources.
-${scriptDir}/../../../kubernetes/delete-weblogic-domain-resources.sh -d all
+tempfile="/tmp/$(basename $0).tmp.$$"  # == /tmp/[script-file-name].tmp.[pid]
+
+echo @@ Deleting domain resources.
+LABEL_SELECTOR="weblogic.domainUID"
+deleteResWithLabel "$tempfile-0"
+deleteNamespaces "$tempfile-0"
 
-# Delete wls operator
-deleteWLSOperators
+echo @@ Deleting wls operator resources.
+LABEL_SELECTOR="weblogic.operatorName"
+deleteResWithLabel "$tempfile-1"
+deleteNamespaces "$tempfile-1"
 
-# Delete voyager controller
-deleteVoyagerController
+echo @@ Deleting voyager controller.
+if [ "$HANDLE_VOYAGER" = "true" ]; then
+  deleteVoyagerController
+fi
 
 # Delete pv directories using a job (/scratch maps to PV_ROOT on the k8s cluster machines).