tests: aks: Simply delete cluster when cleaning up

If we're going to delete the cluster anyway, no need to call
kata-cleanup.

Fixes: #7454

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
This commit is contained in:
Aurélien Bombo 2023-07-25 11:21:30 -07:00
parent cdf04e5018
commit 91a0b3b406

View File

@ -121,6 +121,11 @@ function cleanup() {
echo "Gather information about the nodes and pods before cleaning up the node" echo "Gather information about the nodes and pods before cleaning up the node"
get_nodes_and_pods_info "yes" get_nodes_and_pods_info "yes"
if [ "${platform}" = "aks" ]; then
delete_cluster
return
fi
# Switch back to the default namespace and delete the tests one # Switch back to the default namespace and delete the tests one
kubectl config set-context --current --namespace=default kubectl config set-context --current --namespace=default
kubectl delete namespace kata-containers-k8s-tests kubectl delete namespace kata-containers-k8s-tests
@ -145,10 +150,6 @@ function cleanup() {
kubectl delete ${cleanup_spec} kubectl delete ${cleanup_spec}
kubectl delete -f "${tools_dir}/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml" kubectl delete -f "${tools_dir}/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml"
kubectl delete -f "${tools_dir}/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml" kubectl delete -f "${tools_dir}/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml"
if [ "${platform}" = "aks" ]; then
delete_cluster
fi
} }
function delete_cluster() { function delete_cluster() {