diff --git a/tests/integration/ha_tests/scripts/deploy_chaos_mesh.sh b/tests/integration/ha_tests/scripts/deploy_chaos_mesh.sh index 819f5efd..0a11fb8c 100755 --- a/tests/integration/ha_tests/scripts/deploy_chaos_mesh.sh +++ b/tests/integration/ha_tests/scripts/deploy_chaos_mesh.sh @@ -11,13 +11,13 @@ if [ -z "${chaos_mesh_ns}" ]; then fi deploy_chaos_mesh() { - if [ "$(helm repo list | grep -c 'chaos-mesh')" != "1" ]; then - echo "adding chaos-mesh helm repo" - helm repo add chaos-mesh https://charts.chaos-mesh.org + if [ "$(microk8s.helm repo list | grep -c 'chaos-mesh')" != "1" ]; then + echo "adding chaos-mesh microk8s.helm repo" + microk8s.helm repo add chaos-mesh https://charts.chaos-mesh.org fi echo "installing chaos-mesh" - helm install chaos-mesh chaos-mesh/chaos-mesh --namespace="${chaos_mesh_ns}" --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/var/snap/microk8s/common/run/containerd.sock --set dashboard.create=false --version "${chaos_mesh_version}" --set clusterScoped=false --set controllerManager.targetNamespace="${chaos_mesh_ns}" + microk8s.helm install chaos-mesh chaos-mesh/chaos-mesh --namespace="${chaos_mesh_ns}" --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/var/snap/microk8s/common/run/containerd.sock --set dashboard.create=false --version "${chaos_mesh_version}" --set clusterScoped=false --set controllerManager.targetNamespace="${chaos_mesh_ns}" sleep 10 } diff --git a/tests/integration/ha_tests/scripts/destroy_chaos_mesh.sh b/tests/integration/ha_tests/scripts/destroy_chaos_mesh.sh index c77f2fd4..7daba138 100755 --- a/tests/integration/ha_tests/scripts/destroy_chaos_mesh.sh +++ b/tests/integration/ha_tests/scripts/destroy_chaos_mesh.sh @@ -42,9 +42,9 @@ destroy_chaos_mesh() { timeout 30 kubectl delete crd "$(kubectl get crd | grep 'chaos-mesh.org' | awk '{print $1}')" || : fi - if [ -n "${chaos_mesh_ns}" ] && [ "$(helm repo list --namespace "${chaos_mesh_ns}" | grep -c 'chaos-mesh')" = "1" ]; then - echo "uninstalling chaos-mesh helm repo" - helm uninstall chaos-mesh --namespace "${chaos_mesh_ns}" || : + if [ -n "${chaos_mesh_ns}" ] && [ "$(microk8s.helm repo list --namespace "${chaos_mesh_ns}" | grep -c 'chaos-mesh')" = "1" ]; then + echo "uninstalling chaos-mesh microk8s.helm repo" + microk8s.helm uninstall chaos-mesh --namespace "${chaos_mesh_ns}" || : fi }