X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fclean_kube.sh;h=281f8ce004d3a7459b401c1aff1c8f2716ae2a70;hb=1b732d17463fad74721391b3a87a2a12172da63c;hp=405c194ad5d0c8a7e5376ef64c195e4a7590ea46;hpb=6f48adb69090799c74c29204dd2cd1737cc9d6ac;p=nonrtric.git

diff --git a/test/common/clean_kube.sh b/test/common/clean_kube.sh
index 405c194a..281f8ce0 100755
--- 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"