diff --git a/newsfragments/737.internal.md b/newsfragments/737.internal.md new file mode 100644 index 00000000..1d04d00c --- /dev/null +++ b/newsfragments/737.internal.md @@ -0,0 +1 @@ +Restart curl pods on failure when fetching metrics. diff --git a/tests/integration/lib/helpers.py b/tests/integration/lib/helpers.py index 21065a33..654a7228 100644 --- a/tests/integration/lib/helpers.py +++ b/tests/integration/lib/helpers.py @@ -111,7 +111,9 @@ async def get_deployment_marker(kube_client, generated_data, marker: str): return configmap.data.get(marker) -async def run_pod_with_args(kube_client: AsyncClient, generated_data, image_name, pod_name, args): +async def run_pod_with_args( + kube_client: AsyncClient, generated_data, image_name, pod_name, args, restart_policy="Never" +): pod_pull_secrets = [] if os.environ.get("CI") and ("DOCKERHUB_USERNAME" in os.environ) and ("DOCKERHUB_TOKEN" in os.environ): pod_pull_secrets = [ @@ -120,7 +122,7 @@ async def run_pod_with_args(kube_client: AsyncClient, generated_data, image_name pod = Pod( metadata=ObjectMeta(name=pod_name + "-" + str(int(time.time() * 1000)), namespace=generated_data.ess_namespace), spec=PodSpec( - restartPolicy="Never", + restartPolicy=restart_policy, imagePullSecrets=pod_pull_secrets, containers=[ Container( diff --git a/tests/integration/test_networking.py b/tests/integration/test_networking.py index 95ec68d7..edbda505 100644 --- a/tests/integration/test_networking.py +++ b/tests/integration/test_networking.py @@ -246,6 +246,7 @@ async def has_actual_metrics_on_endpoint( "-s", f"http://{service.metadata.name}.{generated_data.ess_namespace}.svc.cluster.local:{port_spec.port}/metrics", ], + restart_policy="OnFailure", ) for metric_family in text_string_to_metric_families(metrics_data): assert metric_family.name, "Metric family has no name"