X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fclean_kube.sh;h=c3e774396c33fb3fc36f57ab03fc91295cb1f3b8;hb=8fbc63697f2edaaf2c9db40f54b318e7211361e2;hp=f0bdfe6792346c88e397f73da0bea2adce853d9c;hpb=c8f92e94bb2638aa66a1d7c2ba63375bbfcdc8c9;p=nonrtric.git

diff --git a/test/common/clean_kube.sh b/test/common/clean_kube.sh
index f0bdfe67..c3e77439 100755
--- a/test/common/clean_kube.sh
+++ b/test/common/clean_kube.sh
@@ -86,9 +86,9 @@ __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 serviceaccounts"
+	resources="deployments replicaset statefulset services pods configmaps pvc serviceaccounts secrets authorizationpolicies requestauthentications"
 	for restype in $resources; do
-		result=$(kubectl $KUBECONF get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}')
+		result=$(kubectl $KUBECONF get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}' 2> /dev/null)
 		if [ $? -eq 0 ] && [ ! -z "$result" ]; then
 			for resid in $result; do
 				echo  "  Deleting $restype $resid in namespace $namespace with label autotest "
@@ -115,7 +115,7 @@ __kube_delete_all_pv() {
 __kube_wait_for_delete() {
 	echo " Wait for delete in namespace $1 ..."
 	namespace=$1
-	resources="deployments replicaset statefulset services pods configmaps pvc "
+	resources="deployments replicaset statefulset services pods configmaps pvc secrets"
 	for restype in $resources; do
 		result=$(kubectl $KUBECONF get $restype -n $namespace -o jsonpath='{.items[?(@.metadata.labels.autotest)].metadata.name}')
 		if [ $? -eq 0 ] && [ ! -z "$result" ]; then
@@ -173,7 +173,7 @@ __kube_wait_for_delete_pv() {
 echo "Will remove all kube resources marked with label 'autotest'"
 
 print_usage() {
-    echo "Usage: clean_kube.sh [--kubeconfig <kube-config-file>]"
+    echo "Usage: clean_kube.sh [--kubeconfig <kube-config-file>] | [--kubecontext <context name>]"
 }
 
 if [ $# -eq 0 ]; then
@@ -189,6 +189,13 @@ elif [ $# -eq 2 ]; then
             exit
         fi
         KUBECONF="--kubeconfig $2"
+    elif [ $1 == "--kubecontext" ]; then
+        if [ -z $2 ]; then
+            echo "No context found for --kubecontext"
+            print_usage
+            exit
+        fi
+        KUBECONF="--context $2"
     else
         print_usage
         exit