fixes for chaos-mesh

* ensure chaos-mesh availability before test
* fixes destroy script
* function scoped

tests/integration/high_availability/conftest.py

@@ -33,10 +33,9 @@ async def continuous_writes(ops_test: OpsTest) -> None:
     await clear_writes_action.wait()
 
 
-@pytest.fixture()
-async def chaos_mesh(ops_test: OpsTest) -> None:
+@pytest.fixture(scope="function")
+def chaos_mesh(ops_test: OpsTest) -> None:
     """Deploys chaos mesh to the namespace and uninstalls it at the end."""
-    logger.info("Deploying chaos mesh")
     deploy_chaos_mesh(ops_test.model.info.name)
 
     yield

tests/integration/high_availability/high_availability_helpers.py

@@ -242,6 +242,7 @@ def deploy_chaos_mesh(namespace: str) -> None:
     """
     env = os.environ
     env["KUBECONFIG"] = os.path.expanduser("~/.kube/config")
+    logger.info("Deploying Chaos Mesh")
 
     subprocess.check_output(
         " ".join(
@@ -253,6 +254,18 @@ def deploy_chaos_mesh(namespace: str) -> None:
         shell=True,
         env=env,
     )
+    logger.info("Ensure chaos mesh is ready")
+    try:
+        for attempt in Retrying(stop=stop_after_delay(5 * 60), wait=wait_fixed(10)):
+            with attempt:
+                output = subprocess.check_output(
+                    f"kubectl get pods --namespace {namespace} -l app.kubernetes.io/instance=chaos-mesh".split(),
+                    env=env,
+                )
+                assert output.decode().count("Running") == 4, "Chaos Mesh not ready"
+
+    except RetryError:
+        raise Exception("Chaos Mesh pods not found")
 
 
 def destroy_chaos_mesh(namespace: str) -> None:
@@ -493,7 +506,7 @@ async def ensure_all_units_continuous_writes_incrementing(
 
 def isolate_instance_from_cluster(ops_test: OpsTest, unit_name: str) -> None:
     """Apply a NetworkChaos file to use chaos-mesh to simulate a network cut."""
-    with tempfile.NamedTemporaryFile() as temp_file:
+    with tempfile.NamedTemporaryFile(dir=os.getenv("HOME")) as temp_file:
         with open(
             "tests/integration/high_availability/manifests/chaos_network_loss.yml", "r"
         ) as chaos_network_loss_file:
@@ -508,9 +521,15 @@ def isolate_instance_from_cluster(ops_test: OpsTest, unit_name: str) -> None:
 
         env = os.environ
         env["KUBECONFIG"] = os.path.expanduser("~/.kube/config")
-        subprocess.check_output(
-            " ".join(["kubectl", "apply", "-f", temp_file.name]), shell=True, env=env
-        )
+
+        try:
+            subprocess.check_output(
+                " ".join(["kubectl", "apply", "-f", temp_file.name]), shell=True, env=env
+            )
+        except subprocess.CalledProcessError as e:
+            logger.error(e.output)
+            logger.error(e.stderr)
+            raise
 
 
 def remove_instance_isolation(ops_test: OpsTest) -> None:

tests/integration/high_availability/scripts/destroy_chaos_mesh.sh

@@ -15,16 +15,16 @@ destroy_chaos_mesh() {
 	    timeout 30 kubectl delete "${i}" --all --all-namespaces || true
 	done
 
-	if kubectl -n "${chaos_mesh_ns}" get mutatingwebhookconfiguration | grep -q 'choas-mesh-mutation'; then
-		timeout 30 kubectl -n "${chaos_mesh_ns}" delete mutatingwebhookconfiguration chaos-mesh-mutation || true
+	if kubectl get mutatingwebhookconfiguration | grep -q 'chaos-mesh-mutation'; then
+		timeout 30 kubectl delete mutatingwebhookconfiguration chaos-mesh-mutation || true
 	fi
 
-	if kubectl -n "${chaos_mesh_ns}" get validatingwebhookconfiguration | grep -q 'chaos-mesh-validation'; then
-		timeout 30 kubectl -n "${chaos_mesh_ns}" delete validatingwebhookconfiguration chaos-mesh-validation || true
+	if kubectl get validatingwebhookconfiguration | grep -q 'chaos-mesh-validation-auth'; then
+		timeout 30 kubectl delete validatingwebhookconfiguration chaos-mesh-validation-auth || true
 	fi
 
-	if kubectl -n "${chaos_mesh_ns}" get validatingwebhookconfiguration | grep -q 'chaos-mesh-validate-auth'; then
-		timeout 30 kubectl -n "${chaos_mesh_ns}" delete validatingwebhookconfiguration chaos-mesh-validate-auth || true
+	if kubectl get validatingwebhookconfiguration | grep -q 'chaos-mesh-validation'; then
+		timeout 30 kubectl delete validatingwebhookconfiguration chaos-mesh-validation || true
 	fi
 
 	if kubectl get clusterrolebinding | grep -q 'chaos-mesh'; then