Merge "Add kafka jobs to DMaaP Mediator Producer"

[nonrtric.git] / test / common / clean_kube.sh

diff --git a/test/common/clean_kube.sh b/test/common/clean_kube.sh
index 405c194..281f8ce 100755 (executable)
--- a/test/common/clean_kube.sh
+++ b/test/common/clean_kube.sh
@@ -84,27 +84,27 @@ __kube_wait_for_zero_count() {
 __kube_delete_all_resources() {
        echo " Delete all in namespace $1 ..."
        namespace=$1
-       resources="deployments replicaset statefulset services pods configmaps pvc "
+       resources="deployments replicaset statefulset services pods configmaps pvc serviceaccounts"
        for restype in $resources; do
                result=$(kubectl get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}')
                if [ $? -eq 0 ] && [ ! -z "$result" ]; then
                        for resid in $result; do
                                echo  "  Deleting $restype $resid in namespace $namespace with label autotest "
-                               kubectl delete $restype $resid -n $namespace 1> /dev/null 2> /dev/null
+                               kubectl delete --grace-period=1 $restype $resid -n $namespace 1> /dev/null 2> /dev/null
                        done
                fi
        done
 }
 
 __kube_delete_all_pv() {
-       echo " Delete pv ..."
-       resources="pv"
+       echo " Delete all non-namespaced resources ..."
+       resources="pv clusterrolebindings"
        for restype in $resources; do
                result=$(kubectl get $restype -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}')
                if [ $? -eq 0 ] && [ ! -z "$result" ]; then
                        for resid in $result; do
                                echo  "  Deleting $restype $resid with label autotest "
-                               kubectl delete $restype $resid 1> /dev/null 2> /dev/null
+                               kubectl delete --grace-period=1 $restype $resid 1> /dev/null 2> /dev/null
                        done
                fi
        done
@@ -119,7 +119,7 @@ __kube_wait_for_delete() {
                if [ $? -eq 0 ] && [ ! -z "$result" ]; then
                        for resid in $result; do
                                echo  "  Deleting $restype $resid in namespace $namespace with label autotest "
-                               kubectl delete $restype $resid -n $namespace #1> /dev/null 2> /dev/null
+                               kubectl delete --grace-period=1 $restype $resid -n $namespace #1> /dev/null 2> /dev/null
                                echo -ne "  Waiting for $restype $resid in namespace $namespace with label autotest to be deleted..."$SAMELINE
                                T_START=$SECONDS
                                result="dummy"
@@ -147,7 +147,7 @@ __kube_wait_for_delete_pv() {
                if [ $? -eq 0 ] && [ ! -z "$result" ]; then
                        for resid in $result; do
                                echo  "  Deleting $restype $resid with label autotest "
-                               kubectl delete $restype $resid -n $namespace #1> /dev/null 2> /dev/null
+                               kubectl delete --grace-period=1 $restype $resid -n $namespace #1> /dev/null 2> /dev/null
                                echo -ne "  Waiting for $restype $resid with label autotest to be deleted..."$SAMELINE
                                T_START=$SECONDS
                                result="dummy"